diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml
index 0784e48b6a6..0312e7e995d 100644
--- a/templates/test/ci/cluster-template-prow-edgezone.yaml
+++ b/templates/test/ci/cluster-template-prow-edgezone.yaml
@@ -119,7 +119,7 @@ spec:
       kind: AzureMachineTemplate
       name: ${CLUSTER_NAME}-control-plane
   replicas: ${CONTROL_PLANE_MACHINE_COUNT:=1}
-  version: v1.25.0
+  version: ${KUBERNETES_VERSION}
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: AzureMachineTemplate
@@ -154,7 +154,8 @@ metadata:
 spec:
   clusterName: ${CLUSTER_NAME}
   replicas: ${WORKER_MACHINE_COUNT:=2}
-  selector: {}
+  selector:
+    matchLabels: null
   template:
     spec:
       bootstrap:
@@ -167,7 +168,7 @@ spec:
         apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
         kind: AzureMachineTemplate
         name: ${CLUSTER_NAME}-md-0
-      version: v1.25.0
+      version: ${KUBERNETES_VERSION}
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: AzureMachineTemplate
diff --git a/templates/test/ci/prow-edgezone/kustomization.yaml b/templates/test/ci/prow-edgezone/kustomization.yaml
index ca45d8d5814..9e9a123adcc 100644
--- a/templates/test/ci/prow-edgezone/kustomization.yaml
+++ b/templates/test/ci/prow-edgezone/kustomization.yaml
@@ -16,7 +16,6 @@ patches:
 - path: patches/azurecluster-edgezone.yaml
 - path: patches/standardssd-disk.yaml
 - path: patches/machine-type.yaml
-- path: patches/kubernetes-version.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
 
diff --git a/templates/test/ci/prow-edgezone/patches/kubernetes-version.yaml b/templates/test/ci/prow-edgezone/patches/kubernetes-version.yaml
deleted file mode 100644
index 2a9e9c1abfb..00000000000
--- a/templates/test/ci/prow-edgezone/patches/kubernetes-version.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: cluster.x-k8s.io/v1beta1
-kind: MachineDeployment
-metadata:
-  name: ${CLUSTER_NAME}-md-0
-  namespace: default
-spec:
-  template:
-    spec:
-      version: v1.25.0
----
-apiVersion: controlplane.cluster.x-k8s.io/v1beta1
-kind: KubeadmControlPlane
-metadata:
-  name: ${CLUSTER_NAME}-control-plane
-  namespace: default
-spec:
-  version: v1.25.0
\ No newline at end of file