diff --git a/classes/cluster/k8s-aio-contrail/infra/init.yml b/classes/cluster/k8s-aio-contrail/infra/init.yml
index ec7c359..812d237 100644
--- a/classes/cluster/k8s-aio-contrail/infra/init.yml
+++ b/classes/cluster/k8s-aio-contrail/infra/init.yml
@@ -16,7 +16,8 @@
     infra_config_deploy_address: 192.168.10.90
 
     cluster_domain: k8s-aio-contrail.local
-    cluster_name: k8s-aio-contrail
+    # Commented out for temponarily disable test
+    # cluster_name: k8s-aio-contrail
     apt_mk_version: nightly
   linux:
     network:
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
index 599685a..badb177 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
@@ -4,6 +4,7 @@
 - system.linux.network.hosts
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client
+- cluster.k8s-aio-contrail.kubernetes
 - cluster.k8s-aio-contrail.infra
 - cluster.k8s-aio-contrail.opencontrail.compute
 - cluster.overrides
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
index e69ce70..c5735da 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
@@ -4,6 +4,7 @@
 - system.linux.system.repo.docker
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
+- cluster.k8s-aio-contrail.kubernetes
 - cluster.k8s-aio-contrail.kubernetes.compute
 - cluster.overrides
 parameters: