diff --git a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
index b664c087a44..0222980a42b 100644
--- a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
+++ b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
@@ -456,7 +456,7 @@ spec:
       preKubeadmCommands:
       - bash -c /tmp/oot-cred-provider.sh
       - bash -c /tmp/kubeadm-bootstrap.sh
-      - echo '50.0.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'
+      - echo '10.0.11.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'
         >> /etc/hosts
       verbosity: 5
 ---
diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
index 6c2106ec2c1..8dc7193f684 100644
--- a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
+++ b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
@@ -474,6 +474,8 @@ spec:
       preKubeadmCommands:
       - bash -c /tmp/oot-cred-provider.sh
       - bash -c /tmp/kubeadm-bootstrap.sh
+      - echo '10.0.11.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'
+        >> /etc/hosts
       verbosity: 5
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
index dea192908af..cb774dd745a 100644
--- a/templates/test/ci/cluster-template-prow-custom-vnet.yaml
+++ b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
@@ -43,16 +43,16 @@ spec:
           dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com
           name: ${CLUSTER_NAME}-api-lb
       - name: ${CLUSTER_NAME}-internal-lb-private-ip
-        privateIP: 10.13.0.100
+        privateIP: 10.0.11.100
     subnets:
     - cidrBlocks:
-      - 10.13.0.0/24
+      - 10.0.0.0/16
       name: ${AZURE_CUSTOM_VNET_NAME}-controlplane-subnet
       role: control-plane
       securityGroup:
         name: control-plane-nsg
     - cidrBlocks:
-      - 10.13.1.0/24
+      - 10.1.0.0/16
       name: ${AZURE_CUSTOM_VNET_NAME}-node-subnet
       role: node
       routeTable:
@@ -61,7 +61,7 @@ spec:
         name: node-nsg
     vnet:
       cidrBlocks:
-      - 10.13.0.0/16
+      - 10.0.0.0/8
       name: ${AZURE_CUSTOM_VNET_NAME}
       resourceGroup: ${AZURE_CUSTOM_VNET_RESOURCE_GROUP}
   resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}}
@@ -224,7 +224,7 @@ spec:
             cloud-provider: external
           name: '{{ ds.meta_data["local_hostname"] }}'
       preKubeadmCommands:
-      - echo '10.13.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'
+      - echo '10.0.11.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'
         >> /etc/hosts
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml
index 5dcbd5d94a1..425fe50f438 100644
--- a/templates/test/ci/cluster-template-prow-private.yaml
+++ b/templates/test/ci/cluster-template-prow-private.yaml
@@ -237,7 +237,7 @@ spec:
             cloud-provider: external
           name: '{{ ds.meta_data["local_hostname"] }}'
       preKubeadmCommands:
-      - echo '70.0.11.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'
+      - echo '10.0.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'
         >> /etc/hosts
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
diff --git a/templates/test/ci/cluster-template-prow-spot.yaml b/templates/test/ci/cluster-template-prow-spot.yaml
index cd9c09ef977..09b142756fe 100644
--- a/templates/test/ci/cluster-template-prow-spot.yaml
+++ b/templates/test/ci/cluster-template-prow-spot.yaml
@@ -43,19 +43,19 @@ spec:
           dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com
           name: ${CLUSTER_NAME}-api-lb
       - name: ${CLUSTER_NAME}-internal-lb-private-ip
-        privateIP: 10.12.0.100
+        privateIP: 10.0.11.100
     subnets:
     - cidrBlocks:
-      - 10.12.0.0/24
+      - 10.0.0.0/16
       name: control-plane-subnet
       role: control-plane
     - cidrBlocks:
-      - 10.12.1.0/24
+      - 10.1.0.0/16
       name: node-subnet
       role: node
     vnet:
       cidrBlocks:
-      - 10.12.0.0/16
+      - 10.0.0.0/8
       name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet}
   resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
@@ -220,7 +220,7 @@ spec:
             cloud-provider: external
           name: '{{ ds.meta_data["local_hostname"] }}'
       preKubeadmCommands:
-      - echo '10.12.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'
+      - echo '10.0.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'
         >> /etc/hosts
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
diff --git a/templates/test/ci/prow-ci-version-dual-stack/kustomization.yaml b/templates/test/ci/prow-ci-version-dual-stack/kustomization.yaml
index f45fb4ba598..798d0702dbe 100644
--- a/templates/test/ci/prow-ci-version-dual-stack/kustomization.yaml
+++ b/templates/test/ci/prow-ci-version-dual-stack/kustomization.yaml
@@ -33,7 +33,7 @@ patches:
   patch: |-
     - op: add
       path: /spec/template/spec/preKubeadmCommands/-
-      value: echo '50.0.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
+      value: echo '10.0.11.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
 
 
 sortOptions:
diff --git a/templates/test/ci/prow-ci-version-ipv6/kustomization.yaml b/templates/test/ci/prow-ci-version-ipv6/kustomization.yaml
index 7298ad5aaab..24a94fd2c8d 100644
--- a/templates/test/ci/prow-ci-version-ipv6/kustomization.yaml
+++ b/templates/test/ci/prow-ci-version-ipv6/kustomization.yaml
@@ -28,6 +28,13 @@ patches:
 - path: ../prow-ipv6/patches/cluster-label-calico-ipv6.yaml
 - path: patches/machine-deployment.yaml
 - path: ../patches/windows-addons-disabled.yaml
+- target:
+    kind: KubeadmConfigTemplate
+  patch: |-
+    - op: add
+      path: /spec/template/spec/preKubeadmCommands/-
+      value: echo '10.0.11.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
+
 
 sortOptions:
   order: fifo
diff --git a/templates/test/ci/prow-custom-vnet/kustomization.yaml b/templates/test/ci/prow-custom-vnet/kustomization.yaml
index 34690eeaa2a..9fd3b612e63 100644
--- a/templates/test/ci/prow-custom-vnet/kustomization.yaml
+++ b/templates/test/ci/prow-custom-vnet/kustomization.yaml
@@ -22,19 +22,19 @@ patches:
   patch: |-
     - op: add
       path: /spec/template/spec/preKubeadmCommands/-
-      value: echo '10.13.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
+      value: echo '10.0.11.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
 - target:
     kind: AzureCluster
   patch: |-
     - op: replace
       path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP
-      value: 10.13.0.100
+      value: 10.0.11.100
 - target:
     kind: AzureCluster
   patch: |-
     - op: replace
       path: /spec/networkSpec/vnet/cidrBlocks/0
-      value: 10.13.0.0/16
+      value: 10.0.0.0/8
 - target:
     kind: AzureCluster
   patch: |-
@@ -43,7 +43,7 @@ patches:
       value: []
     - op: add
       path: /spec/networkSpec/subnets/0/cidrBlocks/0
-      value: 10.13.0.0/24
+      value: 10.0.0.0/16
 - target:
     kind: AzureCluster
   patch: |-
@@ -52,7 +52,7 @@ patches:
       value: []
     - op: add
       path: /spec/networkSpec/subnets/1/cidrBlocks/0
-      value: 10.13.1.0/24
+      value: 10.1.0.0/16
 - target:
     kind: KubeadmConfigTemplate
   patch: |-
diff --git a/templates/test/ci/prow-private/kustomization.yaml b/templates/test/ci/prow-private/kustomization.yaml
index 059607b987f..b79ec24d2b4 100644
--- a/templates/test/ci/prow-private/kustomization.yaml
+++ b/templates/test/ci/prow-private/kustomization.yaml
@@ -20,6 +20,16 @@ patches:
 - path: ../patches/uami-control-plane.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+# we need to add the default private IP to the hosts file of the worker nodes
+- target:
+    kind: KubeadmConfigTemplate
+  patch: |-
+    - op: remove
+      path: /spec/template/spec/preKubeadmCommands/0
+    - op: add
+      path: /spec/template/spec/preKubeadmCommands/-
+      value: echo '10.0.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
+
 configMapGenerator:
 - files:
   - resources=../../../addons/calico.yaml
diff --git a/templates/test/ci/prow-spot/kustomization.yaml b/templates/test/ci/prow-spot/kustomization.yaml
index 2933e992c0c..635bf56e4fe 100644
--- a/templates/test/ci/prow-spot/kustomization.yaml
+++ b/templates/test/ci/prow-spot/kustomization.yaml
@@ -17,41 +17,6 @@ patches:
 - path: ../patches/uami-control-plane.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
-- target:
-    kind: KubeadmConfigTemplate
-  patch: |-
-    - op: add
-      path: /spec/template/spec/preKubeadmCommands/-
-      value: echo '10.12.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
-- target:
-    kind: AzureCluster
-  patch: |-
-    - op: replace
-      path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP
-      value: 10.12.0.100
-- target:
-    kind: AzureCluster
-  patch: |-
-    - op: replace
-      path: /spec/networkSpec/vnet/cidrBlocks/0
-      value: 10.12.0.0/16
-- target:
-    kind: AzureCluster
-  patch: |-
-    - op: replace
-      path: /spec/networkSpec/subnets/0/cidrBlocks/0
-      value: 10.12.0.0/24
-- target:
-    kind: AzureCluster
-  patch: |-
-    - op: replace
-      path: /spec/networkSpec/subnets/1/cidrBlocks/0
-      value: 10.12.1.0/24
-- target:
-    kind: KubeadmConfigTemplate
-  patch: |-
-    - op: remove
-      path: /spec/template/spec/preKubeadmCommands/0
 
 sortOptions:
   order: fifo