diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 694385a16..85cc58b18 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -21,7 +21,6 @@ spec:
         - --cloud-provider=kubevirt
         - --cloud-config=/etc/cloud/cloud-config
         - --kubeconfig=/etc/kubernetes/kubeconfig/value
-        - --cluster-name=kvcluster
         command:
         - /bin/kubevirt-cloud-controller-manager
         image: quay.io/kubevirt/kubevirt-cloud-controller-manager:main
diff --git a/config/overlays/kubevirtci/kustomization.yaml b/config/overlays/kubevirtci/kustomization.yaml
index 9044188f0..b488162e3 100644
--- a/config/overlays/kubevirtci/kustomization.yaml
+++ b/config/overlays/kubevirtci/kustomization.yaml
@@ -5,3 +5,11 @@ bases:
 
 patchesStrategicMerge:
 - manager_image_patch.yaml
+
+patches:
+- patch: |-
+    - op: add
+      path: /spec/template/spec/containers/0/args/-
+      value: --cluster-name=$TENANT_CLUSTER_NAME
+  target:
+    kind: Deployment
diff --git a/kubevirtci b/kubevirtci
index 5d6117ed9..9b8ad51b7 100755
--- a/kubevirtci
+++ b/kubevirtci
@@ -192,13 +192,13 @@ EOF
 	REGISTRY=$REGISTRY make image push
 	$_ssh_infra node01  -- sudo cat  /etc/kubernetes/admin.conf > config/secret/infra-kubeconfig
 	$CLUSTERCTL_PATH get kubeconfig ${TENANT_CLUSTER_NAME} -n ${TENANT_CLUSTER_NAMESPACE} > config/secret/kubeconfig
-	${_kubectl} kustomize config/overlays/kubevirtci | ${_kubectl} apply -f -
+	${_kubectl} kustomize config/overlays/kubevirtci | envsubst | ${_kubectl} apply -f -
     ${_kubectl} delete pod -n kvcluster -l k8s-app=kubevirt-cloud-controller-manager
     ${_kubectl} rollout status -w -n ${TENANT_CLUSTER_NAMESPACE} deployment/kubevirt-cloud-controller-manager
 }
 
 function kubevirtci::delete() {
-	${_kubectl} kustomize config/overlays/kubevirtci | ${_kubectl} delete --ignore-not-found -f -
+	${_kubectl} kustomize config/overlays/kubevirtci | envsubst | ${_kubectl} delete --ignore-not-found -f -
 }
 
 function kubevirtci::install_calico {