diff --git a/Makefile b/Makefile
index 787301699..2e1dcd98e 100644
--- a/Makefile
+++ b/Makefile
@@ -63,10 +63,9 @@ KIND_CLUSTER_NAME := operator-controller
 endif
 
 ifeq ($(origin KIND_CONFIG), undefined)
-KIND_CONFIG := ./kind-config.yaml
+KIND_CONFIG := ./kind-config/kind-config.yaml
 endif
 
-
 ifneq (, $(shell command -v docker 2>/dev/null))
 CONTAINER_RUNTIME := docker
 else ifneq (, $(shell command -v podman 2>/dev/null))
@@ -286,7 +285,7 @@ test-e2e: run-internal image-registry prometheus e2e e2e-coverage kind-clean #HE
 .PHONY: test-experimental-e2e
 test-experimental-e2e: SOURCE_MANIFEST := $(EXPERIMENTAL_E2E_MANIFEST)
 test-experimental-e2e: KIND_CLUSTER_NAME := operator-controller-e2e
-test-experimental-e2e: KIND_CONFIG := ./kind-config-experimental.yaml
+test-experimental-e2e: KIND_CONFIG := ./kind-config/kind-config-2node.yaml
 test-experimental-e2e: GO_BUILD_EXTRA_FLAGS := -cover
 test-experimental-e2e: COVERAGE_NAME := experimental-e2e
 test-experimental-e2e: export MANIFEST := $(EXPERIMENTAL_RELEASE_MANIFEST)
diff --git a/kind-config-experimental.yaml b/kind-config/kind-config-2node.yaml
similarity index 100%
rename from kind-config-experimental.yaml
rename to kind-config/kind-config-2node.yaml
diff --git a/kind-config.yaml b/kind-config/kind-config.yaml
similarity index 100%
rename from kind-config.yaml
rename to kind-config/kind-config.yaml