diff --git a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml
index 40ec2d4ef74..b8422a0b77d 100644
--- a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml
+++ b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml
@@ -244,25 +244,3 @@ spec:
             cloud-provider: external
           name: '{{ ds.meta_data["local_hostname"] }}'
       preKubeadmCommands: []
----
-apiVersion: cluster.x-k8s.io/v1beta1
-kind: Cluster
-metadata:
-  name: ${CLUSTER_NAME}
-  namespace: default
-spec:
-  clusterNetwork:
-    pods:
-      cidrBlocks:
-      - 192.168.0.0/16
-  topology:
-    class: default
-    version: ${KUBERNETES_VERSION}
-    workers:
-      machinePools:
-      - class: default-system
-        name: mp-0
-        replicas: 1
-      - class: default-worker
-        name: mp-1
-        replicas: 1
diff --git a/templates/test/ci/cluster-template-prow-aks-topology.yaml b/templates/test/ci/cluster-template-prow-aks-topology.yaml
new file mode 100644
index 00000000000..5329e5c338e
--- /dev/null
+++ b/templates/test/ci/cluster-template-prow-aks-topology.yaml
@@ -0,0 +1,21 @@
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: ${CLUSTER_NAME}
+  namespace: default
+spec:
+  clusterNetwork:
+    pods:
+      cidrBlocks:
+      - 192.168.0.0/16
+  topology:
+    class: default
+    version: ${KUBERNETES_VERSION}
+    workers:
+      machinePools:
+      - class: default-system
+        name: mp-0
+        replicas: 1
+      - class: default-worker
+        name: mp-1
+        replicas: 1
diff --git a/templates/test/ci/prow-aks-clusterclass/kustomization.yaml b/templates/test/ci/prow-aks-clusterclass/kustomization.yaml
index 8da06dd1d50..573379be24a 100644
--- a/templates/test/ci/prow-aks-clusterclass/kustomization.yaml
+++ b/templates/test/ci/prow-aks-clusterclass/kustomization.yaml
@@ -3,12 +3,10 @@ kind: Kustomization
 namespace: default
 resources:
 - ../../../flavors/aks-clusterclass
-- ../../../flavors/aks-topology
 patches:
 - path: patches/tags-aks-clusterclass.yaml
 - path: patches/aks-clusterclass-pool0.yaml
 - path: patches/aks-clusterclass-pool1.yaml
-- path: patches/cluster.yaml
 - path: patches/addons.yaml
 - path: patches/kubeadm-config-template.yaml
 - path: patches.yaml
diff --git a/templates/test/ci/prow-aks-topology/kustomization.yaml b/templates/test/ci/prow-aks-topology/kustomization.yaml
new file mode 100644
index 00000000000..ddf193876c4
--- /dev/null
+++ b/templates/test/ci/prow-aks-topology/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: default
+resources:
+- ../../../flavors/aks-topology
+patches:
+- path: patches/cluster.yaml
+
+sortOptions:
+  order: fifo
diff --git a/templates/test/ci/prow-aks-clusterclass/patches/cluster.yaml b/templates/test/ci/prow-aks-topology/patches/cluster.yaml
similarity index 100%
rename from templates/test/ci/prow-aks-clusterclass/patches/cluster.yaml
rename to templates/test/ci/prow-aks-topology/patches/cluster.yaml
diff --git a/test/e2e/azure_test.go b/test/e2e/azure_test.go
index fef3c8fe4db..a5e92fec8be 100644
--- a/test/e2e/azure_test.go
+++ b/test/e2e/azure_test.go
@@ -893,7 +893,7 @@ var _ = Describe("Workload cluster creation", func() {
 			// Create a cluster using the cluster class created above
 			clusterctl.ApplyClusterTemplateAndWait(ctx, createApplyClusterTemplateInput(
 				specName,
-				withFlavor("aks-clusterclass"),
+				withFlavor("aks-topology"),
 				withAzureCNIv1Manifest(e2eConfig.GetVariable(AzureCNIv1Manifest)),
 				withNamespace(namespace.Name),
 				withClusterName(clusterName),
diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml
index 31b9a3a8194..3750c342036 100644
--- a/test/e2e/config/azure-dev.yaml
+++ b/test/e2e/config/azure-dev.yaml
@@ -139,8 +139,8 @@ providers:
         targetName: "cluster-template-machine-pool-flex.yaml"
       - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-aks.yaml"
         targetName: "cluster-template-aks.yaml"
-      - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml"
-        targetName: "cluster-template-aks-clusterclass.yaml"
+      - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-aks-topology.yaml"
+        targetName: "cluster-template-aks-topology.yaml"
       - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-aks-aso.yaml"
         targetName: "cluster-template-aks-aso.yaml"
       - sourcePath: "${PWD}/templates/test/ci/cluster-template-prow-custom-vnet.yaml"