diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml
index 65ef0fc..e1c7b96 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml
@@ -9,7 +9,7 @@
 - system.mysql.client.database.grafana
 - system.reclass.storage.salt
 - system.reclass.storage.system.kubernetes_control_cluster
-- cluster.virtual-mcp11-k8s-calico-dyn.infra
+- cluster.virtual-mcp11-k8s-calico-dyn
 parameters:
   _param:
     salt_master_base_environment: prd
@@ -19,12 +19,12 @@
     single_address: ${_param:infra_config_address}
     linux_system_codename: xenial
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
-    salt_master_host: ${_param:infra_config_deploy_address}
+    salt_master_host: 127.0.0.1
   salt:
     master:
       reactor:
         reclass/minion/classify:
-        - salt://reclass/reactor/node_register.sls  
+        - salt://reclass/reactor/node_register.sls
   reclass:
     storage:
       class_mapping:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
index 3866d0b..21675fb 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
@@ -12,9 +12,6 @@
 - system.telegraf.agent
 - system.prometheus.collector
 - service.grafana.collector
-- cluster.virtual-mcp11-k8s-calico-dyn.kubernetes
-- cluster.virtual-mcp11-k8s-calico-dyn.stacklight
-- cluster.overrides
 parameters:
   _param:
     # infra service addresses
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/init.yml
new file mode 100644
index 0000000..5484c66
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/init.yml
@@ -0,0 +1,5 @@
+classes:
+- cluster.virtual-mcp11-k8s-calico-dyn.kubernetes
+- cluster.virtual-mcp11-k8s-calico-dyn.stacklight
+- cluster.virtual-mcp11-k8s-calico-dyn.infra
+- cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
index 09ae36f..9307e4f 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
@@ -3,7 +3,7 @@
 - system.kubernetes.pool.cluster
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client
-- cluster.virtual-mcp11-k8s-calico-dyn.infra
+- cluster.virtual-mcp11-k8s-calico-dyn
 parameters:
   _param:
     kubernetes_calicoctl_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/ctl:latest
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
index 1454c17..e2f150a 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
@@ -5,7 +5,7 @@
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
 - cluster.virtual-mcp11-k8s-calico-dyn.kubernetes.compute
-- cluster.virtual-mcp11-k8s-calico-dyn.infra
+- cluster.virtual-mcp11-k8s-calico-dyn
 parameters:
   _param:
     keepalived_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/proxy.yml
index 0c2866c..8f82ce5 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/proxy.yml
@@ -2,7 +2,7 @@
 - system.nginx.server.single
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
-- cluster.virtual-mcp11-k8s-calico-dyn.infra
+- cluster.virtual-mcp11-k8s-calico-dyn
 parameters:
   _param:
     cluster_public_host: ${_param:prometheus_control_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
index 7b78102..8e56ad6 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -22,7 +22,7 @@
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.service.dashboard.grafana_server
-- cluster.virtual-mcp11-k8s-calico-dyn.infra
+- cluster.virtual-mcp11-k8s-calico-dyn
 parameters:
   _param:
     cluster_vip_address: ${_param:stacklight_address}