diff --git a/templates/cluster-template-kccm.yaml b/templates/cluster-template-kccm.yaml
index cb71cb05..ab7e2c56 100644
--- a/templates/cluster-template-kccm.yaml
+++ b/templates/cluster-template-kccm.yaml
@@ -238,7 +238,7 @@ data:
   cloud-config: |
     loadBalancer:
       creationPollInterval: 30
-    namespace: kvcluster
+    namespace: ${NAMESPACE}
     instancesV2:
       enabled: true
       zoneAndRegionEnabled: false
@@ -278,7 +278,7 @@ spec:
         - --cloud-provider=kubevirt
         - --cloud-config=/etc/cloud/cloud-config
         - --kubeconfig=/etc/kubernetes/kubeconfig/value
-        - --cluster-name=kvcluster
+        - --cluster-name=${CLUSTER_NAME}
         - --authentication-skip-lookup=true
         command:
         - /bin/kubevirt-cloud-controller-manager
diff --git a/templates/cluster-template-lb-kccm.yaml b/templates/cluster-template-lb-kccm.yaml
index c9ccf6a8..b951162f 100644
--- a/templates/cluster-template-lb-kccm.yaml
+++ b/templates/cluster-template-lb-kccm.yaml
@@ -238,7 +238,7 @@ data:
   cloud-config: |
     loadBalancer:
       creationPollInterval: 30
-    namespace: kvcluster
+    namespace: ${NAMESPACE}
     instancesV2:
       enabled: true
       zoneAndRegionEnabled: false
@@ -278,7 +278,7 @@ spec:
         - --cloud-provider=kubevirt
         - --cloud-config=/etc/cloud/cloud-config
         - --kubeconfig=/etc/kubernetes/kubeconfig/value
-        - --cluster-name=kvcluster
+        - --cluster-name=${CLUSTER_NAME}
         - --authentication-skip-lookup=true
         command:
         - /bin/kubevirt-cloud-controller-manager
diff --git a/templates/cluster-template-passt-kccm.yaml b/templates/cluster-template-passt-kccm.yaml
index f8da9b1a..c6c15466 100644
--- a/templates/cluster-template-passt-kccm.yaml
+++ b/templates/cluster-template-passt-kccm.yaml
@@ -248,7 +248,7 @@ data:
   cloud-config: |
     loadBalancer:
       creationPollInterval: 30
-    namespace: kvcluster
+    namespace: ${NAMESPACE}
     instancesV2:
       enabled: true
       zoneAndRegionEnabled: false
@@ -288,7 +288,7 @@ spec:
         - --cloud-provider=kubevirt
         - --cloud-config=/etc/cloud/cloud-config
         - --kubeconfig=/etc/kubernetes/kubeconfig/value
-        - --cluster-name=kvcluster
+        - --cluster-name=${CLUSTER_NAME}
         - --authentication-skip-lookup=true
         command:
         - /bin/kubevirt-cloud-controller-manager
diff --git a/templates/cluster-template-persistent-storage-kccm.yaml b/templates/cluster-template-persistent-storage-kccm.yaml
index 9d591e55..692e2a76 100644
--- a/templates/cluster-template-persistent-storage-kccm.yaml
+++ b/templates/cluster-template-persistent-storage-kccm.yaml
@@ -262,7 +262,7 @@ data:
   cloud-config: |
     loadBalancer:
       creationPollInterval: 30
-    namespace: kvcluster
+    namespace: ${NAMESPACE}
     instancesV2:
       enabled: true
       zoneAndRegionEnabled: false
@@ -302,7 +302,7 @@ spec:
         - --cloud-provider=kubevirt
         - --cloud-config=/etc/cloud/cloud-config
         - --kubeconfig=/etc/kubernetes/kubeconfig/value
-        - --cluster-name=kvcluster
+        - --cluster-name=${CLUSTER_NAME}
         - --authentication-skip-lookup=true
         command:
         - /bin/kubevirt-cloud-controller-manager