diff --git a/Makefile b/Makefile
index e5db9f143307..c66b5aa961ee 100644
--- a/Makefile
+++ b/Makefile
@@ -166,10 +166,6 @@ E2E_CONF_FILE ?= $(ROOT_DIR)/test/e2e/config/azure-dev.yaml
 E2E_CONF_FILE_ENVSUBST := $(ROOT_DIR)/test/e2e/config/azure-dev-envsubst.yaml
 E2E_CLOUD_PROVIDER_AZURE_PATH ?= $(ROOT_DIR)/templates/caaph/cloud-provider-azure.yaml
 E2E_CLOUD_PROVIDER_AZURE_CI_PATH ?= $(ROOT_DIR)/templates/caaph/cloud-provider-azure-ci.yaml
-E2E_CALICO_PATH ?= $(ROOT_DIR)/templates/caaph/calico.yaml
-E2E_CALICO_IPV6_PATH ?= $(ROOT_DIR)/templates/caaph/calico-ipv6.yaml
-E2E_CALICO_DUAL_STACK_PATH ?= $(ROOT_DIR)/templates/caaph/calico-dual-stack.yaml
-E2E_AZUREDISK_CSI_DRIVER ?= $(ROOT_DIR)/templates/caaph/azuredisk-csi-driver.yaml
 
 SKIP_CLEANUP ?= false
 SKIP_LOG_COLLECTION ?= false
@@ -678,10 +674,6 @@ test-e2e-run: generate-e2e-templates install-tools ## Run e2e tests.
     	-e2e.config="$(E2E_CONF_FILE_ENVSUBST)" \
 		-e2e.cloud-provider-azure="$(E2E_CLOUD_PROVIDER_AZURE_PATH)" \
 		-e2e.cloud-provider-azure-ci="$(E2E_CLOUD_PROVIDER_AZURE_CI_PATH)" \
-		-e2e.calico="$(E2E_CALICO_PATH)" \
-		-e2e.calico-ipv6="$(E2E_CALICO_IPV6_PATH)" \
-		-e2e.calico-dual-stack="$(E2E_CALICO_DUAL_STACK_PATH)" \
-		-e2e.azuredisk-csi-driver="$(E2E_AZUREDISK_CSI_DRIVER)" \
     	-e2e.skip-log-collection="$(SKIP_LOG_COLLECTION)" \
     	-e2e.skip-resource-cleanup=$(SKIP_CLEANUP) -e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER) $(E2E_ARGS)
 
diff --git a/templates/caaph/azuredisk-csi-driver.yaml b/templates/caaph/azuredisk-csi-driver.yaml
deleted file mode 100644
index a32a85e8b4aa..000000000000
--- a/templates/caaph/azuredisk-csi-driver.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: addons.cluster.x-k8s.io/v1alpha1
-kind: HelmChartProxy
-metadata:
-  name: azuredisk-csi-driver
-spec:
-  clusterSelector:
-    matchLabels:
-      installAzureDiskCSIDriverChart: "true"
-  repoURL: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts
-  chartName: azuredisk-csi-driver
-  releaseName: azuredisk-csi-driver-oot
-  namespace: kube-system
-  valuesTemplate: |
-    controller:
-      replicas: 1
-      runOnControlPlane: true
-    windows:
-      useHostProcessContainers: {{ hasKey .Cluster.metadata.labels "cni-windows" }}
\ No newline at end of file
diff --git a/templates/caaph/calico-dual-stack.yaml b/templates/caaph/calico-dual-stack.yaml
deleted file mode 100644
index cd1e00b249b8..000000000000
--- a/templates/caaph/calico-dual-stack.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-apiVersion: addons.cluster.x-k8s.io/v1alpha1
-kind: HelmChartProxy
-metadata:
-  name: calico-dual-stack
-spec:
-  clusterSelector:
-    # Target workload clusters with specific labels.
-    matchLabels:
-      cni: calico-dual-stack
-  repoURL: https://docs.tigera.io/calico/charts
-  chartName: tigera-operator
-  releaseName: tigera-operator
-  namespace: tigera-operator
-  valuesTemplate: |
-    installation:
-      cni:
-        type: Calico
-        ipam:
-          type: HostLocal
-      calicoNetwork:
-        bgp: Disabled
-        mtu: 1350
-        ipPools:
-        - blockSize: 26
-          cidr: {{ index .Cluster.spec.clusterNetwork.pods.cidrBlocks 0 }}
-          encapsulation: None
-          natOutgoing: Enabled
-          nodeSelector: all()
-        - blockSize: 122
-          cidr: {{ index .Cluster.spec.clusterNetwork.pods.cidrBlocks 1 }}
-          encapsulation: None
-          natOutgoing: Enabled
-          nodeSelector: all()
diff --git a/templates/caaph/calico-ipv6.yaml b/templates/caaph/calico-ipv6.yaml
deleted file mode 100644
index 71cd1e3e4cdc..000000000000
--- a/templates/caaph/calico-ipv6.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-apiVersion: addons.cluster.x-k8s.io/v1alpha1
-kind: HelmChartProxy
-metadata:
-  name: calico-ipv6
-spec:
-  clusterSelector:
-    # Target workload clusters with specific labels.
-    matchLabels:
-      cni: calico-ipv6
-  repoURL: https://docs.tigera.io/calico/charts
-  chartName: tigera-operator
-  releaseName: tigera-operator
-  namespace: tigera-operator
-  valuesTemplate: |
-    installation:
-      cni:
-        type: Calico
-        ipam:
-          type: HostLocal
-      calicoNetwork:
-        bgp: Disabled
-        mtu: 1350
-        ipPools: {{ range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
-        - blockSize: 122
-          cidr: {{ $cidr }}
-          encapsulation: None
-          natOutgoing: Enabled
-          nodeSelector: all()
-          encapsulation: VXLAN{{ end }}
-  # TODO: pay attention to newlines at the end that get inserted by templates
diff --git a/templates/caaph/calico.yaml b/templates/caaph/calico.yaml
deleted file mode 100644
index 5d0d018ffb3b..000000000000
--- a/templates/caaph/calico.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: addons.cluster.x-k8s.io/v1alpha1
-kind: HelmChartProxy
-metadata:
-  name: calico
-spec:
-  clusterSelector:
-    # Target workload clusters with specific labels.
-    matchLabels:
-      cni: calico
-  repoURL: https://docs.tigera.io/calico/charts
-  chartName: tigera-operator
-  releaseName: tigera-operator
-  namespace: tigera-operator
-  valuesTemplate: |
-    installation:
-      cni:
-        type: Calico
-      calicoNetwork:
-        bgp: Disabled
-        mtu: 1350
-        ipPools:{{ range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
-        - cidr: {{ $cidr }}
-          encapsulation: VXLAN{{ end }}
-  # TODO: pay attention to newlines at the end that get inserted by templates
diff --git a/templates/cluster-template-aad.yaml b/templates/cluster-template-aad.yaml
index e22ffa787ebd..4f42a4ae0709 100644
--- a/templates/cluster-template-aad.yaml
+++ b/templates/cluster-template-aad.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/cluster-template-azure-bastion.yaml b/templates/cluster-template-azure-bastion.yaml
index 3db43cf56f3c..1658d2cfe612 100644
--- a/templates/cluster-template-azure-bastion.yaml
+++ b/templates/cluster-template-azure-bastion.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/cluster-template-dual-stack.yaml b/templates/cluster-template-dual-stack.yaml
index 9738c2488af8..f1eba4a7af02 100644
--- a/templates/cluster-template-dual-stack.yaml
+++ b/templates/cluster-template-dual-stack.yaml
@@ -3,7 +3,6 @@ kind: Cluster
 metadata:
   labels:
     cni: calico-dual-stack
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/cluster-template-edgezone.yaml b/templates/cluster-template-edgezone.yaml
index 6f9b51d893a3..c7e8f67671fa 100644
--- a/templates/cluster-template-edgezone.yaml
+++ b/templates/cluster-template-edgezone.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/cluster-template-ephemeral.yaml b/templates/cluster-template-ephemeral.yaml
index d2ee74e900ee..196388d4968e 100644
--- a/templates/cluster-template-ephemeral.yaml
+++ b/templates/cluster-template-ephemeral.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/cluster-template-flatcar.yaml b/templates/cluster-template-flatcar.yaml
index b13fb1e2a798..f270ed1be10f 100644
--- a/templates/cluster-template-flatcar.yaml
+++ b/templates/cluster-template-flatcar.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/cluster-template-ipv6.yaml b/templates/cluster-template-ipv6.yaml
index 1371b6276132..e0d22cbf6dfb 100644
--- a/templates/cluster-template-ipv6.yaml
+++ b/templates/cluster-template-ipv6.yaml
@@ -3,7 +3,6 @@ kind: Cluster
 metadata:
   labels:
     cni: calico-ipv6
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/cluster-template-machinepool-windows.yaml b/templates/cluster-template-machinepool-windows.yaml
index e22c0f455b9e..22671e030389 100644
--- a/templates/cluster-template-machinepool-windows.yaml
+++ b/templates/cluster-template-machinepool-windows.yaml
@@ -2,10 +2,8 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
     cni-windows: calico
     csi-proxy: enabled
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
     windows: enabled
   name: ${CLUSTER_NAME}
diff --git a/templates/cluster-template-machinepool.yaml b/templates/cluster-template-machinepool.yaml
index 206b7792723e..347d22480ff2 100644
--- a/templates/cluster-template-machinepool.yaml
+++ b/templates/cluster-template-machinepool.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/cluster-template-nvidia-gpu.yaml b/templates/cluster-template-nvidia-gpu.yaml
index ff43a6e8637b..1320d0a3653b 100644
--- a/templates/cluster-template-nvidia-gpu.yaml
+++ b/templates/cluster-template-nvidia-gpu.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/cluster-template-private.yaml b/templates/cluster-template-private.yaml
index 20e67f0f14d8..9d340b002006 100644
--- a/templates/cluster-template-private.yaml
+++ b/templates/cluster-template-private.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/cluster-template-windows.yaml b/templates/cluster-template-windows.yaml
index 0913e23284e2..bd234c01bd96 100644
--- a/templates/cluster-template-windows.yaml
+++ b/templates/cluster-template-windows.yaml
@@ -2,10 +2,8 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
     cni-windows: calico
     csi-proxy: enabled
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
     windows: enabled
   name: ${CLUSTER_NAME}
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
index 4a53417f6141..b4c961cab779 100644
--- a/templates/cluster-template.yaml
+++ b/templates/cluster-template.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/flavors/base/cluster-template.yaml b/templates/flavors/base/cluster-template.yaml
index 7e8c568ff421..120f4cc27a96 100644
--- a/templates/flavors/base/cluster-template.yaml
+++ b/templates/flavors/base/cluster-template.yaml
@@ -5,8 +5,6 @@ metadata:
   name: ${CLUSTER_NAME}
   labels:
     installCloudProviderAzureChart: "true"
-    installAzureDiskCSIDriverChart: "true"
-    cni: calico
 spec:
   clusterNetwork:
     pods:
diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
index c7712cc28d85..742d2cab8b64 100644
--- a/templates/test/ci/cluster-template-prow-ci-version.yaml
+++ b/templates/test/ci/cluster-template-prow-ci-version.yaml
@@ -2,11 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
     cni-windows: ${CLUSTER_NAME}-calico
     containerd-logger: enabled
     csi-proxy: enabled
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
     metrics-server: enabled
   name: ${CLUSTER_NAME}
diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
index 1ba3ba83e07a..6a2cc05f1c4a 100644
--- a/templates/test/ci/cluster-template-prow-custom-vnet.yaml
+++ b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml
index bbf24837354f..a73f13ec783e 100644
--- a/templates/test/ci/cluster-template-prow-dual-stack.yaml
+++ b/templates/test/ci/cluster-template-prow-dual-stack.yaml
@@ -3,7 +3,6 @@ kind: Cluster
 metadata:
   labels:
     cni: calico-dual-stack
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml
index 7e1c65bd687f..d61aa39c2281 100644
--- a/templates/test/ci/cluster-template-prow-edgezone.yaml
+++ b/templates/test/ci/cluster-template-prow-edgezone.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml
index 315041b79448..00fe8060c9f8 100644
--- a/templates/test/ci/cluster-template-prow-flatcar.yaml
+++ b/templates/test/ci/cluster-template-prow-flatcar.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml
index b6e5c81cea1e..11ec314986b2 100644
--- a/templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml
+++ b/templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml
@@ -2,11 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
     cni-windows: ${CLUSTER_NAME}-calico
     containerd-logger: enabled
     csi-proxy: enabled
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
     windows: enabled
   name: ${CLUSTER_NAME}
diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml
index 123060910d31..5810b203bef1 100644
--- a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml
+++ b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml
@@ -2,11 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
     cni-windows: ${CLUSTER_NAME}-calico
     containerd-logger: enabled
     csi-proxy: enabled
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml
index 7a97bf4b50d4..d3dc98a871fa 100644
--- a/templates/test/ci/cluster-template-prow-ipv6.yaml
+++ b/templates/test/ci/cluster-template-prow-ipv6.yaml
@@ -3,7 +3,6 @@ kind: Cluster
 metadata:
   labels:
     cni: calico-ipv6
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
index 3ebef4fff1bf..12b6ee2dffbc 100644
--- a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
+++ b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
@@ -2,11 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
     cni-windows: ${CLUSTER_NAME}-calico
     containerd-logger: enabled
     csi-proxy: enabled
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
     windows: enabled
   name: ${CLUSTER_NAME}
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml
index 00f1b2eb4aa2..cbf34ecbf2ed 100644
--- a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml
+++ b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml
@@ -2,11 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
     cni-windows: ${CLUSTER_NAME}-calico
     containerd-logger: enabled
     csi-proxy: enabled
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
     windows: enabled
   name: ${CLUSTER_NAME}
diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml
index c1147d78d8ba..5f43005ffac5 100644
--- a/templates/test/ci/cluster-template-prow-machine-pool.yaml
+++ b/templates/test/ci/cluster-template-prow-machine-pool.yaml
@@ -2,11 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
     cni-windows: ${CLUSTER_NAME}-calico
     containerd-logger: enabled
     csi-proxy: enabled
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
     windows: enabled
   name: ${CLUSTER_NAME}
diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml
index c31033bdf40d..1e0f67dd9d40 100644
--- a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml
+++ b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml
@@ -2,8 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml
index 589c0a5abb26..13696e7739d3 100644
--- a/templates/test/ci/cluster-template-prow-private.yaml
+++ b/templates/test/ci/cluster-template-prow-private.yaml
@@ -3,7 +3,6 @@ kind: Cluster
 metadata:
   labels:
     cni: ${CLUSTER_NAME}-calico
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml
index 972cc459957b..eafe10a3f4fb 100644
--- a/templates/test/ci/cluster-template-prow.yaml
+++ b/templates/test/ci/cluster-template-prow.yaml
@@ -2,11 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
     cni-windows: ${CLUSTER_NAME}-calico
     containerd-logger: enabled
     csi-proxy: enabled
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
index 6bfa2685b162..8e4804dd53f0 100644
--- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
+++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
@@ -2,11 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
     cni-windows: ${CLUSTER_NAME}-calico
     containerd-logger: enabled
     csi-proxy: enabled
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
     windows: enabled
   name: ${CLUSTER_NAME}
diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml
index 7a6a2cefab69..6c6f1bf03fa6 100644
--- a/templates/test/dev/cluster-template-custom-builds.yaml
+++ b/templates/test/dev/cluster-template-custom-builds.yaml
@@ -2,11 +2,9 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: calico
     cni-windows: ${CLUSTER_NAME}-calico
     containerd-logger: enabled
     csi-proxy: enabled
-    installAzureDiskCSIDriverChart: "true"
     installCloudProviderAzureChart: "true"
     metrics-server: enabled
   name: ${CLUSTER_NAME}
diff --git a/test/e2e/azure_test.go b/test/e2e/azure_test.go
index 258522f1edb8..fd22f5204fd6 100644
--- a/test/e2e/azure_test.go
+++ b/test/e2e/azure_test.go
@@ -91,18 +91,6 @@ var _ = Describe("Workload cluster creation", func() {
 		}
 		createHelmChartProxyFromFilePath(bootstrapClient, path, namespace.Name)
 
-		By("Creating calico add-on template")
-		createHelmChartProxyFromFilePath(bootstrapClient, calicoPath, namespace.Name)
-
-		By("Creating calico ipv6 add-on template")
-		createHelmChartProxyFromFilePath(bootstrapClient, calicoIPv6Path, namespace.Name)
-
-		By("Creating calico dual-stack add-on template")
-		createHelmChartProxyFromFilePath(bootstrapClient, calicoDualStackPath, namespace.Name)
-
-		By("Creating azuredisk-csi-driver add-on template")
-		createHelmChartProxyFromFilePath(bootstrapClient, azureDiskCSIDriverPath, namespace.Name)
-
 		result = new(clusterctl.ApplyClusterTemplateAndWaitResult)
 
 		spClientSecret := os.Getenv(AzureClientSecret)
diff --git a/test/e2e/cloud-provider-azure.go b/test/e2e/cloud-provider-azure.go
index a216b091aea5..0b1ff2d7b5b1 100644
--- a/test/e2e/cloud-provider-azure.go
+++ b/test/e2e/cloud-provider-azure.go
@@ -21,9 +21,6 @@ package e2e
 
 import (
 	"context"
-	"fmt"
-	"os"
-	"strings"
 
 	. "github.com/onsi/ginkgo/v2"
 	helmVals "helm.sh/helm/v3/pkg/cli/values"
@@ -31,56 +28,24 @@ import (
 )
 
 const (
-	cloudProviderAzureHelmRepoURL     = "https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo"
-	cloudProviderAzureChartName       = "cloud-provider-azure"
-	cloudProviderAzureHelmReleaseName = "cloud-provider-azure-oot"
 	azureDiskCSIDriverHelmRepoURL     = "https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts"
 	azureDiskCSIDriverChartName       = "azuredisk-csi-driver"
 	azureDiskCSIDriverHelmReleaseName = "azuredisk-csi-driver-oot"
 )
 
-// InstallCalicoAndCloudProviderAzureHelmChart installs the official cloud-provider-azure helm chart
-// and validates that expected pods exist and are Ready.
-func InstallCalicoAndCloudProviderAzureHelmChart(ctx context.Context, input clusterctl.ApplyClusterTemplateAndWaitInput, cidrBlocks []string, hasWindows bool) {
-	specName := "cloud-provider-azure-install"
-	By("Installing cloud-provider-azure components via helm")
-	options := &helmVals.Options{
-		Values: []string{
-			fmt.Sprintf("infra.clusterName=%s", input.ConfigCluster.ClusterName),
-			"cloudControllerManager.logVerbosity=4",
-		},
-		StringValues: []string{fmt.Sprintf("cloudControllerManager.clusterCIDR=%s", strings.Join(cidrBlocks, `\,`))},
-	}
-	// If testing a CI version of Kubernetes, use CCM and CNM images built from source.
-	if useCIArtifacts {
-		options.Values = append(options.Values, fmt.Sprintf("cloudControllerManager.imageName=%s", os.Getenv("CCM_IMAGE_NAME")))
-		options.Values = append(options.Values, fmt.Sprintf("cloudNodeManager.imageName=%s", os.Getenv("CNM_IMAGE_NAME")))
-		options.Values = append(options.Values, fmt.Sprintf("cloudControllerManager.imageRepository=%s", os.Getenv("IMAGE_REGISTRY")))
-		options.Values = append(options.Values, fmt.Sprintf("cloudNodeManager.imageRepository=%s", os.Getenv("IMAGE_REGISTRY")))
-		options.StringValues = append(options.StringValues, fmt.Sprintf("cloudControllerManager.imageTag=%s", os.Getenv("IMAGE_TAG_CCM")))
-		options.StringValues = append(options.StringValues, fmt.Sprintf("cloudNodeManager.imageTag=%s", os.Getenv("IMAGE_TAG_CNM")))
-	}
-
-	clusterProxy := input.ClusterProxy.GetWorkloadCluster(ctx, input.ConfigCluster.Namespace, input.ConfigCluster.ClusterName)
-	InstallHelmChart(ctx, clusterProxy, defaultNamespace, cloudProviderAzureHelmRepoURL, cloudProviderAzureChartName, cloudProviderAzureHelmReleaseName, options)
-
-	// Install Calico CNI Helm Chart. We do this before waiting for the pods to be ready because there is a co-dependency between CNI (nodes ready) and cloud-provider being initialized.
-	InstallCalicoHelmChart(ctx, input, cidrBlocks, hasWindows)
-
-	By("Waiting for Ready cloud-controller-manager deployment pods")
-	for _, d := range []string{"cloud-controller-manager"} {
-		waitInput := GetWaitForDeploymentsAvailableInput(ctx, clusterProxy, d, kubesystem, specName)
-		WaitForDeploymentsAvailable(ctx, waitInput, e2eConfig.GetIntervals(specName, "wait-deployment")...)
-	}
-}
-
 // InstallAzureDiskCSIDriverHelmChart installs the official azure-disk CSI driver helm chart
 func InstallAzureDiskCSIDriverHelmChart(ctx context.Context, input clusterctl.ApplyClusterTemplateAndWaitInput, hasWindows bool) {
 	specName := "azuredisk-csi-drivers-install"
-
-	By("Waiting for azure disk CSI driver components to be installed via CAAPH")
+	By("Installing azure-disk CSI driver components via helm")
+	options := &helmVals.Options{
+		Values: []string{"controller.replicas=1", "controller.runOnControlPlane=true"},
+	}
+	// TODO: make this always true once HostProcessContainers are on for all supported k8s versions.
+	if hasWindows {
+		options.Values = append(options.Values, "windows.useHostProcessContainers=true")
+	}
 	clusterProxy := input.ClusterProxy.GetWorkloadCluster(ctx, input.ConfigCluster.Namespace, input.ConfigCluster.ClusterName)
-
+	InstallHelmChart(ctx, clusterProxy, kubesystem, azureDiskCSIDriverHelmRepoURL, azureDiskCSIDriverChartName, azureDiskCSIDriverHelmReleaseName, options)
 	By("Waiting for Ready csi-azuredisk-controller deployment pods")
 	for _, d := range []string{"csi-azuredisk-controller"} {
 		waitInput := GetWaitForDeploymentsAvailableInput(ctx, clusterProxy, d, kubesystem, specName)
diff --git a/test/e2e/cni.go b/test/e2e/cni.go
index 2a400557ef87..244a189734cb 100644
--- a/test/e2e/cni.go
+++ b/test/e2e/cni.go
@@ -46,10 +46,10 @@ const (
 func InstallCalicoHelmChart(ctx context.Context, input clusterctl.ApplyClusterTemplateAndWaitInput, cidrBlocks []string, hasWindows bool) {
 	specName := "calico-install"
 
-	By("Waiting for Calico CNI to be set up via CAAPH")
-	// values := getCalicoValues(cidrBlocks)
+	By("Installing Calico via Helm")
+	values := getCalicoValues(cidrBlocks)
 	clusterProxy := input.ClusterProxy.GetWorkloadCluster(ctx, input.ConfigCluster.Namespace, input.ConfigCluster.ClusterName)
-	// InstallHelmChart(ctx, clusterProxy, calicoOperatorNamespace, calicoHelmChartRepoURL, calicoHelmChartName, calicoHelmReleaseName, values)
+	InstallHelmChart(ctx, clusterProxy, calicoOperatorNamespace, calicoHelmChartRepoURL, calicoHelmChartName, calicoHelmReleaseName, values)
 	workloadClusterClient := clusterProxy.GetClient()
 
 	// Copy the kubeadm configmap to the calico-system namespace. This is a workaround needed for the calico-node-windows daemonset to be able to run in the calico-system namespace.
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
index 501d56c2851a..e84ea38b1733 100644
--- a/test/e2e/e2e_suite_test.go
+++ b/test/e2e/e2e_suite_test.go
@@ -41,10 +41,6 @@ func init() {
 	flag.StringVar(&configPath, "e2e.config", "", "path to the e2e config file")
 	flag.StringVar(&cloudProviderAzurePath, "e2e.cloud-provider-azure", "", "path to the cloud-provider-azure HelmChartProxy")
 	flag.StringVar(&cloudProviderAzureCIPath, "e2e.cloud-provider-azure-ci", "", "path to the cloud-provider-azure HelmChartProxy with CI artifacts")
-	flag.StringVar(&calicoPath, "e2e.calico", "", "path to the calico HelmChartProxy")
-	flag.StringVar(&calicoIPv6Path, "e2e.calico-ipv6", "", "path to the ipv6 calico HelmChartProxy")
-	flag.StringVar(&calicoDualStackPath, "e2e.calico-dual-stack", "", "path to the dual stack calico HelmChartProxy")
-	flag.StringVar(&azureDiskCSIDriverPath, "e2e.azuredisk-csi-driver", "", "path to the azure disk csi driver HelmChartProxy")
 	flag.StringVar(&artifactFolder, "e2e.artifacts-folder", "", "folder where e2e test artifact should be stored")
 	flag.BoolVar(&useCIArtifacts, "kubetest.use-ci-artifacts", false, "use the latest build from the main branch of the Kubernetes repository. Set KUBERNETES_VERSION environment variable to latest-1.xx to use the build from 1.xx release branch.")
 	flag.BoolVar(&usePRArtifacts, "kubetest.use-pr-artifacts", false, "use the build from a PR of the Kubernetes repository")
diff --git a/test/e2e/e2e_suite_vars.go b/test/e2e/e2e_suite_vars.go
index 5b99313cec16..221ff3e513b6 100644
--- a/test/e2e/e2e_suite_vars.go
+++ b/test/e2e/e2e_suite_vars.go
@@ -82,16 +82,4 @@ var (
 
 	// cloudProviderAzureCIPath specifies the path to the cloud-provider-azure HelmChartProxy with CI artifacts enabled
 	cloudProviderAzureCIPath string
-
-	// calicoPath specifies the path to the calico HelmChartProxy
-	calicoPath string
-
-	// calicoIPv6Path specifies the path to the calico IPv6 HelmChartProxy
-	calicoIPv6Path string
-
-	// calicoDualStackPath specifies the path to the calico dual stack HelmChartProxy
-	calicoDualStackPath string
-
-	// azureDiskCSIDriverPath specifies the path to the azure disk csidriver HelmChartProxy
-	azureDiskCSIDriverPath string
 )