diff --git a/Makefile b/Makefile
index ec7dbfca6..1fe72e91a 100644
--- a/Makefile
+++ b/Makefile
@@ -163,7 +163,8 @@ kind-deploy: manifests $(KUSTOMIZE) #EXHELP Install controller and dependencies
 .PHONY: kind-cluster
 kind-cluster: $(KIND) #EXHELP Standup a kind cluster.
 	-$(KIND) delete cluster --name ${KIND_CLUSTER_NAME}
-	$(KIND) create cluster --name ${KIND_CLUSTER_NAME} --image ${KIND_CLUSTER_IMAGE}
+	# kind-config.yaml can be deleted after upgrading to Kubernetes 1.30
+	$(KIND) create cluster --name ${KIND_CLUSTER_NAME} --image ${KIND_CLUSTER_IMAGE} --config ./kind-config.yaml
 	$(KIND) export kubeconfig --name ${KIND_CLUSTER_NAME}
 
 .PHONY: kind-clean
diff --git a/kind-config.yaml b/kind-config.yaml
new file mode 100644
index 000000000..40b75f935
--- /dev/null
+++ b/kind-config.yaml
@@ -0,0 +1,8 @@
+# Can be deleted after upgrading to Kubernetes 1.30
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+featureGates:
+  ValidatingAdmissionPolicy: true
+runtimeConfig:
+  admissionregistration.k8s.io/v1beta1: true
+