diff --git a/templates/cluster-template-clusterclass.yaml b/templates/cluster-template-clusterclass.yaml
index 8241698d8e..8bd569c7f1 100644
--- a/templates/cluster-template-clusterclass.yaml
+++ b/templates/cluster-template-clusterclass.yaml
@@ -197,7 +197,7 @@ data:
               key: node.kubernetes.io/not-ready
               operator: Exists
           containers:
-            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.3.1}"
+            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.3.2}"
               imagePullPolicy: IfNotPresent
               name: nutanix-cloud-controller-manager
               env:
@@ -269,7 +269,7 @@ spec:
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate
 metadata:
-  name: ${CLUSTER_NAME}-kcfg-0
+  name: ${CLUSTER_CLASS_NAME}-kcfg-0
   namespace: ${NAMESPACE}
 spec:
   template:
@@ -584,7 +584,7 @@ spec:
           ref:
             apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
             kind: KubeadmConfigTemplate
-            name: ${CLUSTER_NAME}-kcfg-0
+            name: ${CLUSTER_CLASS_NAME}-kcfg-0
             namespace: ${NAMESPACE}
         infrastructure:
           ref:
diff --git a/templates/clusterclass/clusterclass.yaml b/templates/clusterclass/clusterclass.yaml
index 93aa08fb55..043cc6673a 100644
--- a/templates/clusterclass/clusterclass.yaml
+++ b/templates/clusterclass/clusterclass.yaml
@@ -45,7 +45,7 @@ spec:
           ref:
             apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
             kind: KubeadmConfigTemplate
-            name: "${CLUSTER_NAME}-kcfg-0"
+            name: "${CLUSTER_CLASS_NAME}-kcfg-0"
             namespace: ${NAMESPACE}
         infrastructure:
           ref:
diff --git a/templates/clusterclass/kct.yaml b/templates/clusterclass/kct.yaml
index 74fc727819..ca1ae6d599 100644
--- a/templates/clusterclass/kct.yaml
+++ b/templates/clusterclass/kct.yaml
@@ -1,7 +1,7 @@
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate
 metadata:
-  name: "${CLUSTER_NAME}-kcfg-0"
+  name: "${CLUSTER_CLASS_NAME}-kcfg-0"
 spec:
   template:
     spec:
diff --git a/test/e2e/data/infrastructure-nutanix/v1beta1/clusterclass-e2e.yaml b/test/e2e/data/infrastructure-nutanix/v1beta1/clusterclass-e2e.yaml
index 8241698d8e..8bd569c7f1 100644
--- a/test/e2e/data/infrastructure-nutanix/v1beta1/clusterclass-e2e.yaml
+++ b/test/e2e/data/infrastructure-nutanix/v1beta1/clusterclass-e2e.yaml
@@ -197,7 +197,7 @@ data:
               key: node.kubernetes.io/not-ready
               operator: Exists
           containers:
-            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.3.1}"
+            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.3.2}"
               imagePullPolicy: IfNotPresent
               name: nutanix-cloud-controller-manager
               env:
@@ -269,7 +269,7 @@ spec:
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate
 metadata:
-  name: ${CLUSTER_NAME}-kcfg-0
+  name: ${CLUSTER_CLASS_NAME}-kcfg-0
   namespace: ${NAMESPACE}
 spec:
   template:
@@ -584,7 +584,7 @@ spec:
           ref:
             apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
             kind: KubeadmConfigTemplate
-            name: ${CLUSTER_NAME}-kcfg-0
+            name: ${CLUSTER_CLASS_NAME}-kcfg-0
             namespace: ${NAMESPACE}
         infrastructure:
           ref: