diff --git a/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml b/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
index 01aae0e85e..944d432b99 100644
--- a/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
+++ b/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
@@ -1,7 +1,7 @@
 parameters:
   dependsOn: ""
   name: "cilium"
-  clusterType: "cilium-overlay-up"
+  clusterType: "overlay-byocni-nokubeproxy-up"
   clusterName: "cilium-overlay"
   nodeCount: 10
   vmSize: "Standard_DS4_v2"
diff --git a/.pipelines/cni/cilium/nightly-release-test.yml b/.pipelines/cni/cilium/nightly-release-test.yml
index bff0dbee73..d8bd5c4d5e 100644
--- a/.pipelines/cni/cilium/nightly-release-test.yml
+++ b/.pipelines/cni/cilium/nightly-release-test.yml
@@ -70,7 +70,7 @@ stages:
         parameters:
           name: cilium_overlay_nightly
           displayName: Cilium on AKS Overlay
-          clusterType: cilium-overlay-up
+          clusterType: overlay-byocni-nokubeproxy-up
           clusterName: ciliumnightly-$(commitID)
           vmSize: Standard_B2ms
           k8sVersion: ""
diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
index 891cf16a5c..07355347d4 100644
--- a/.pipelines/cni/pipeline.yaml
+++ b/.pipelines/cni/pipeline.yaml
@@ -20,7 +20,7 @@ stages:
   - template: cilium/cilium-overlay-load-test-template.yaml
     parameters:
       name: cilium
-      clusterType: cilium-overlay-up
+      clusterType: overlay-byocni-nokubeproxy-up
       clusterName: "cilium-overlay"
       nodeCount: ${CILIUM_NODE_COUNT}
       vmSize: "Standard_DS4_v2"
diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
index c75d21c782..83b5a1964e 100644
--- a/.pipelines/pipeline.yaml
+++ b/.pipelines/pipeline.yaml
@@ -316,7 +316,7 @@ stages:
       name: "cilium_e2e"
       displayName: Cilium
       testDropgz: ""
-      clusterType: cilium-podsubnet-up
+      clusterType: swift-byocni-nokubeproxy-up
       clusterName: "ciliume2e"
       vmSize: Standard_B2ms
       k8sVersion: ""
@@ -327,7 +327,7 @@ stages:
       name: "cilium_overlay_cilium_e2e"
       displayName: Cilium on AKS Overlay
       testDropgz: ""
-      clusterType: cilium-overlay-up
+      clusterType: overlay-byocni-nokubeproxy-up
       clusterName: "overlaye2e"
       vmSize: Standard_B2ms
       k8sVersion: ""
diff --git a/.pipelines/submodules-pipeline.yaml b/.pipelines/submodules-pipeline.yaml
index ee60d1d466..48f45be210 100644
--- a/.pipelines/submodules-pipeline.yaml
+++ b/.pipelines/submodules-pipeline.yaml
@@ -268,7 +268,7 @@ stages:
       name: "cilium_e2e"
       displayName: Cilium
       testDropgz: true
-      clusterType: cilium-podsubnet-up
+      clusterType: swift-byocni-nokubeproxy-up
       clusterName: "submodciliume2e"
       vmSize: Standard_B2ms
       k8sVersion: ""
@@ -280,7 +280,7 @@ stages:
       name: "cilium_overlay_e2e"
       displayName: Cilium on AKS Overlay
       testDropgz: true
-      clusterType: cilium-overlay-up
+      clusterType: overlay-byocni-nokubeproxy-up
       clusterName: "submodoverlaye2e"
       vmSize: Standard_B2ms
       k8sVersion: ""
diff --git a/hack/aks/Makefile b/hack/aks/Makefile
index d35bf2b4ed..60d208d4fe 100644
--- a/hack/aks/Makefile
+++ b/hack/aks/Makefile
@@ -99,26 +99,27 @@ overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster
 		--yes
 	@$(MAKE) set-kubeconf
 
-overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster
+overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy
 	$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
 		--node-count $(NODE_COUNT) \
 		--node-vm-size $(VM_SIZE) \
 		--load-balancer-sku basic \
-		--network-plugin azure \
-		--network-dataplane cilium \
+		--network-plugin none \
 		--network-plugin-mode overlay \
 		--pod-cidr 192.168.0.0/16 \
 		--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
 		--no-ssh-key \
+		--kube-proxy-config ./kube-proxy.json \
 		--yes
 	@$(MAKE) set-kubeconf
 
-overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster
+overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster
 	$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
 		--node-count $(NODE_COUNT) \
 		--node-vm-size $(VM_SIZE) \
 		--load-balancer-sku basic \
 		--network-plugin azure \
+		--network-dataplane cilium \
 		--network-plugin-mode overlay \
 		--pod-cidr 192.168.0.0/16 \
 		--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
@@ -126,71 +127,69 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster
 		--yes
 	@$(MAKE) set-kubeconf
 
-swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster
+overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster
 	$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
 		--node-count $(NODE_COUNT) \
 		--node-vm-size $(VM_SIZE) \
 		--load-balancer-sku basic \
-		--network-plugin none \
+		--network-plugin azure \
+		--network-plugin-mode overlay \
+		--pod-cidr 192.168.0.0/16 \
 		--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
-		--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
 		--no-ssh-key \
-		--os-sku $(OS_SKU) \
 		--yes
 	@$(MAKE) set-kubeconf
 
-
-swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster
+swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster
 	$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
 		--node-count $(NODE_COUNT) \
 		--node-vm-size $(VM_SIZE) \
 		--load-balancer-sku basic \
-		--network-plugin azure \
-		--network-dataplane cilium \
-		--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \
+		--network-plugin none \
 		--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
 		--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
 		--no-ssh-key \
+		--os-sku $(OS_SKU) \
 		--yes
 	@$(MAKE) set-kubeconf
 
-swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster
+swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy
 	$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
 		--node-count $(NODE_COUNT) \
 		--node-vm-size $(VM_SIZE) \
 		--load-balancer-sku basic \
-		--network-plugin azure \
+		--network-plugin none \
 		--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
 		--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
 		--no-ssh-key \
+		--os-sku $(OS_SKU) \
+		--kube-proxy-config ./kube-proxy.json \
 		--yes
 	@$(MAKE) set-kubeconf
 
-cilium-overlay-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy for Cilium
+swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster
 	$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
 		--node-count $(NODE_COUNT) \
 		--node-vm-size $(VM_SIZE) \
 		--load-balancer-sku basic \
-		--network-plugin none \
-		--network-plugin-mode overlay \
-		--pod-cidr 192.168.0.0/16 \
+		--network-plugin azure \
+		--network-dataplane cilium \
+		--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \
 		--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
+		--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
 		--no-ssh-key \
-		--kube-proxy-config ./kube-proxy.json \
 		--yes
 	@$(MAKE) set-kubeconf
 
-cilium-podsubnet-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy for Cilium
+swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster
 	$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
 		--node-count $(NODE_COUNT) \
 		--node-vm-size $(VM_SIZE) \
 		--load-balancer-sku basic \
-		--network-plugin none \
+		--network-plugin azure \
 		--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
 		--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
 		--no-ssh-key \
-		--os-sku $(OS_SKU) \
-		--kube-proxy-config ./kube-proxy.json \
 		--yes
 	@$(MAKE) set-kubeconf
 
diff --git a/hack/aks/README.md b/hack/aks/README.md
index b28b83c815..cfcb8154b9 100644
--- a/hack/aks/README.md
+++ b/hack/aks/README.md
@@ -21,20 +21,20 @@ SWIFT Infra
   net-up           Create required swift vnet/subnets
 
 AKS Clusters
-  byocni-up                    Alias to swift-byocni-up
-  cilium-up                    Alias to swift-cilium-up
-  up                           Alias to swift-up
-  overlay-byocni-up            Bring up a Overlay BYO CNI cluster
-  overlay-cilium-up            Bring up a Overlay Cilium cluster
-  overlay-up                   Bring up a Overlay AzCNI cluster
-  swift-byocni-up              Bring up a SWIFT BYO CNI cluster
-  swift-cilium-up              Bring up a SWIFT Cilium cluster
-  swift-up                     Bring up a SWIFT AzCNI cluster
-  cilium-overlay-up            Bring up a Overlay BYO CNI cluster without kube-proxy for Cilium
-  cilium-podsubnet-up          Bring up a SWIFT BYO CNI cluster without kube-proxy for Cilium
-  windows-cniv1-up             Bring up a Windows AzCNIv1 cluster
-  linux-cniv1-up               Bring up a Linux AzCNIv1 cluster
-  dualstack-overlay-byocni-up  Bring up an dualstack overlay cluster without CNS and CNI installed
-  down                         Delete the cluster
-  vmss-restart                 Restart the nodes of the cluster
+  byocni-up                     Alias to swift-byocni-up
+  cilium-up                     Alias to swift-cilium-up
+  up                            Alias to swift-up
+  overlay-byocni-up             Bring up a Overlay BYO CNI cluster
+  overlay-byocni-nokubeproxy-up Bring up a Overlay BYO CNI cluster without kube-proxy
+  overlay-cilium-up             Bring up a Overlay Cilium cluster
+  overlay-up                    Bring up a Overlay AzCNI cluster
+  swift-byocni-up               Bring up a SWIFT BYO CNI cluster
+  swift-byocni-nokubeproxy-up   Bring up a SWIFT BYO CNI cluster without kube-proxy
+  swift-cilium-up               Bring up a SWIFT Cilium cluster
+  swift-up                      Bring up a SWIFT AzCNI cluster
+  windows-cniv1-up              Bring up a Windows AzCNIv1 cluster
+  linux-cniv1-up                Bring up a Linux AzCNIv1 cluster
+  dualstack-overlay-byocni-up   Bring up an dualstack overlay cluster without CNS and CNI installed
+  down                          Delete the cluster
+  vmss-restart                  Restart the nodes of the cluster
 ```