diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
index 4d1420a2eff..d65464d6f5f 100644
--- a/.pipelines/pipeline.yaml
+++ b/.pipelines/pipeline.yaml
@@ -327,7 +327,7 @@ stages:
       vmSize: Standard_B2ms
       k8sVersion: ""
       windowsOsSku: ""
-      dependsOn: 'validate1'
+      dependsOn: 'containerize'
 
   - template: singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
     parameters:
@@ -340,7 +340,7 @@ stages:
       vmSize: Standard_B2ms
       k8sVersion: ""
       windowsOsSku: ""
-      dependsOn: 'validate1'
+      dependsOn: 'containerize'
 
   - template: singletenancy/aks-swift/e2e-job-template.yaml
     parameters:
@@ -353,7 +353,7 @@ stages:
       vmSize: Standard_B2s
       k8sVersion: ""
       windowsOsSku: ""
-      dependsOn: 'validate1'
+      dependsOn: 'containerize'
 
   - template: singletenancy/aks/e2e-job-template.yaml
     parameters:
@@ -366,7 +366,7 @@ stages:
       vmSize: Standard_B2s
       k8sVersion: 1.25
       scaleup: 100
-      dependsOn: 'validate1'
+      dependsOn: 'containerize'
 
   - template: singletenancy/aks/e2e-job-template.yaml
     parameters:
@@ -380,7 +380,7 @@ stages:
       windowsOsSku: 'Windows2022'
       os_version: 'ltsc2022'
       scaleup: 50
-      dependsOn: 'validate1'
+      dependsOn: 'containerize'
 
   - stage: validate2
     displayName: Validate Tags
diff --git a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
index 2148c74a6ee..7bd4f8845bd 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
@@ -14,7 +14,7 @@ parameters:
 
 
 stages:
-  - template: ../aks/e2e-cluster-template.yaml
+  - template: ../../templates/create-cluster.yaml
     parameters:
       name: ${{ parameters.name }}
       displayName: ${{ parameters.displayName }}
diff --git a/.pipelines/singletenancy/aks/e2e-job-template.yaml b/.pipelines/singletenancy/aks/e2e-job-template.yaml
index 0203eb5a382..a86c3117af5 100644
--- a/.pipelines/singletenancy/aks/e2e-job-template.yaml
+++ b/.pipelines/singletenancy/aks/e2e-job-template.yaml
@@ -13,7 +13,7 @@ parameters:
   dependsOn: ""
 
 stages:
-  - template: e2e-cluster-template.yaml
+  - template: ../../templates/create-cluster.yaml
     parameters:
       name: ${{ parameters.name }}
       displayName: ${{ parameters.displayName }}
diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
index 85067549621..bfd1f0e0a59 100644
--- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
@@ -11,7 +11,7 @@ parameters:
   dependsOn: ""
 
 stages:
-  - template: ../aks/e2e-cluster-template.yaml
+  - template: ../../templates/create-cluster.yaml
     parameters:
       name: ${{ parameters.name }}
       displayName: ${{ parameters.displayName }}
diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
index 8a5a7c32b0d..239b853e784 100644
--- a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
@@ -11,7 +11,7 @@ parameters:
   dependsOn: ""
 
 stages:
-  - template: ../aks/e2e-cluster-template.yaml
+  - template: ../../templates/create-cluster.yaml
     parameters:
       name: ${{ parameters.name }}
       displayName: ${{ parameters.displayName }}
diff --git a/.pipelines/singletenancy/aks/e2e-cluster-template.yaml b/.pipelines/templates/create-cluster.yaml
similarity index 100%
rename from .pipelines/singletenancy/aks/e2e-cluster-template.yaml
rename to .pipelines/templates/create-cluster.yaml