diff --git a/classes/cluster/drivetrain_ha_clusters/infra/config.yml b/classes/cluster/drivetrain_ha_clusters/infra/config.yml
index 87ecd64..4cb7db5 100644
--- a/classes/cluster/drivetrain_ha_clusters/infra/config.yml
+++ b/classes/cluster/drivetrain_ha_clusters/infra/config.yml
@@ -46,7 +46,9 @@
             salt_master_host:
               value_template: <<node_master_ip>>
         infra_config:
-          expression: <<node_hostname>>__startswith__cfg
+          expression:
+          - <<node_hostname>>__startswith__cfg
+          - <<node_cluster>>__equals__drivetrain_ha_clusters
           cluster_param:
             infra_config_address:
               value_template: <<node_control_ip>>
diff --git a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
index 6814c21..f3e98a4 100644
--- a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
@@ -7,7 +7,7 @@
 - system.salt.minion.cert.k8s_server
 - system.reclass.storage.salt
 - system.reclass.storage.system.kubernetes_control_cluster
-- cluster.k8s_ha_calico
+- cluster.k8s_ha_calico_syndic
 parameters:
   _param:
     salt_master_base_environment: prd
@@ -40,7 +40,9 @@
             salt_master_host:
               value_template: <<node_master_ip>>
         infra_config:
-          expression: <<node_hostname>>__startswith__cfg
+          expression:
+          - <<node_hostname>>__startswith__cfg
+          - <<node_cluster>>__equals__k8s_ha_calico_syndic
           cluster_param:
             infra_config_address:
               value_template: <<node_control_ip>>
diff --git a/classes/cluster/k8s_ha_calico_syndic/init.yml b/classes/cluster/k8s_ha_calico_syndic/init.yml
index c672dd1..7b55c9f 100644
--- a/classes/cluster/k8s_ha_calico_syndic/init.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/init.yml
@@ -1,4 +1,4 @@
 classes:
-- cluster.k8s_ha_calico.kubernetes
-- cluster.k8s_ha_calico.infra
+- cluster.k8s_ha_calico_syndic.kubernetes
+- cluster.k8s_ha_calico_syndic.infra
 - cluster.overrides
diff --git a/classes/cluster/k8s_ha_calico_syndic/kubernetes/compute.yml b/classes/cluster/k8s_ha_calico_syndic/kubernetes/compute.yml
index 3bb7828..29203d0 100644
--- a/classes/cluster/k8s_ha_calico_syndic/kubernetes/compute.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/kubernetes/compute.yml
@@ -3,7 +3,7 @@
 - system.kubernetes.pool.cluster
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client
-- cluster.k8s_ha_calico
+- cluster.k8s_ha_calico_syndic
 parameters:
   _param:
     kubernetes_calicoctl_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/ctl:latest
diff --git a/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml b/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml
index 1003ff7..14772c9 100644
--- a/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.docker
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
-- cluster.k8s_ha_calico.kubernetes.compute
-- cluster.k8s_ha_calico
+- cluster.k8s_ha_calico_syndic.kubernetes.compute
+- cluster.k8s_ha_calico_syndic
 parameters:
   _param:
     keepalived_vip_interface: ${_param:primary_interface}
diff --git a/classes/cluster/os_ha_ovs_syndic/infra/config.yml b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
index c4e6757..4adbcbe 100644
--- a/classes/cluster/os_ha_ovs_syndic/infra/config.yml
+++ b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
@@ -22,8 +22,8 @@
 - system.mysql.client.database.nova_api
 - system.mysql.client.database.neutron
 - system.reclass.storage.system.openstack_control_cluster
-- cluster.os_ha_ovs.openstack.proxy
-- cluster.os_ha_ovs
+- cluster.os_ha_ovs_syndic.openstack.proxy
+- cluster.os_ha_ovs_syndic
 parameters:
   _param:
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
@@ -75,7 +75,10 @@
             salt_master_host:
               value_template: <<node_master_ip>>
         infra_config:
-          expression: <<node_hostname>>__startswith__cfg
+        infra_config:
+          expression:
+          - <<node_hostname>>__startswith__cfg
+          - <<node_cluster>>__equals__os_ha_ovs_syndic
           cluster_param:
             infra_config_address:
               value_template: <<node_control_ip>>
diff --git a/classes/cluster/os_ha_ovs_syndic/infra/init.yml b/classes/cluster/os_ha_ovs_syndic/infra/init.yml
index 9dd0187..c6de909 100644
--- a/classes/cluster/os_ha_ovs_syndic/infra/init.yml
+++ b/classes/cluster/os_ha_ovs_syndic/infra/init.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
-    cluster_domain: os_ha_ovs.local
-    cluster_name: os_ha_ovs
+    cluster_domain: os_ha_ovs_syndic.local
+    cluster_name: os_ha_ovs_syndic
     infra_config_deploy_address: 192.168.10.90
     infra_config_address: 172.16.10.90
     salt_syndic_master_address: 192.168.10.90
diff --git a/classes/cluster/os_ha_ovs_syndic/init.yml b/classes/cluster/os_ha_ovs_syndic/init.yml
index 000ee69..1d6bb29 100644
--- a/classes/cluster/os_ha_ovs_syndic/init.yml
+++ b/classes/cluster/os_ha_ovs_syndic/init.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.single
-- cluster.os_ha_ovs.infra
-- cluster.os_ha_ovs.openstack
+- cluster.os_ha_ovs_syndic.infra
+- cluster.os_ha_ovs_syndic.openstack
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
diff --git a/classes/cluster/os_ha_ovs_syndic/openstack/compute.yml b/classes/cluster/os_ha_ovs_syndic/openstack/compute.yml
index e86bf67..c3b76fd 100644
--- a/classes/cluster/os_ha_ovs_syndic/openstack/compute.yml
+++ b/classes/cluster/os_ha_ovs_syndic/openstack/compute.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.saltstack.xenial
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
-- cluster.os_ha_ovs
+- cluster.os_ha_ovs_syndic
 parameters:
   _param:
     primary_interface: ens4
diff --git a/classes/cluster/os_ha_ovs_syndic/openstack/control.yml b/classes/cluster/os_ha_ovs_syndic/openstack/control.yml
index 5e8accb..1b3d2db 100644
--- a/classes/cluster/os_ha_ovs_syndic/openstack/control.yml
+++ b/classes/cluster/os_ha_ovs_syndic/openstack/control.yml
@@ -26,8 +26,8 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
-- cluster.os_ha_ovs.openstack.dashboard
-- cluster.os_ha_ovs
+- cluster.os_ha_ovs_syndic.openstack.dashboard
+- cluster.os_ha_ovs_syndic
 parameters:
   _param:
     keepalived_vip_interface: ens4
diff --git a/classes/cluster/os_ha_ovs_syndic/openstack/dashboard.yml b/classes/cluster/os_ha_ovs_syndic/openstack/dashboard.yml
index ddddaa9..1e4565a 100644
--- a/classes/cluster/os_ha_ovs_syndic/openstack/dashboard.yml
+++ b/classes/cluster/os_ha_ovs_syndic/openstack/dashboard.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.horizon.server.cluster
-- cluster.os_ha_ovs
+- cluster.os_ha_ovs_syndic
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/os_ha_ovs_syndic/openstack/proxy.yml b/classes/cluster/os_ha_ovs_syndic/openstack/proxy.yml
index a819195..880b908 100644
--- a/classes/cluster/os_ha_ovs_syndic/openstack/proxy.yml
+++ b/classes/cluster/os_ha_ovs_syndic/openstack/proxy.yml
@@ -4,7 +4,7 @@
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
 - system.salt.minion.cert.proxy
-- cluster.os_ha_ovs
+- cluster.os_ha_ovs_syndic
 parameters:
   _param:
     nginx_proxy_ssl: