diff --git a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
index f3e98a4..0bd7355 100644
--- a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
@@ -51,22 +51,31 @@
             cluster_domain:
               value_template: <<node_domain>>
         kubernetes_control01:
-          expression: <<node_hostname>>__equals__ctl01
+          expression:
+          - <<node_hostname>>__equals__ctl01
+          - <<node_cluster>>__equals__k8s_ha_calico_syndic
           cluster_param:
             kubernetes_control_node01_address:
               value_template: <<node_control_ip>>
         kubernetes_control02:
-          expression: <<node_hostname>>__equals__ctl02
+          expression:
+          - <<node_hostname>>__equals__ctl02
+          - <<node_cluster>>__equals__k8s_ha_calico_syndic
           cluster_param:
             kubernetes_control_node02_address:
               value_template: <<node_control_ip>>
         kubernetes_control03:
-          expression: <<node_hostname>>__equals__ctl03
+          expression:
+          - <<node_hostname>>__equals__ctl03
+          - <<node_cluster>>__equals__k8s_ha_calico_syndic
           cluster_param:
             kubernetes_control_node03_address:
               value_template: <<node_control_ip>>
         kubernetes_compute:
-          expression: <<node_hostname>>__startswith__cmp
+          expression:
+          - <<node_hostname>>__startswith__cmp
+          - <<node_cluster>>__equals__k8s_ha_calico_syndic
           node_class:
             value_template:
               - cluster.<<node_cluster>>.kubernetes.compute
+
diff --git a/classes/cluster/os_ha_ovs_syndic/infra/config.yml b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
index 4adbcbe..b60ba47 100644
--- a/classes/cluster/os_ha_ovs_syndic/infra/config.yml
+++ b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
@@ -75,7 +75,6 @@
             salt_master_host:
               value_template: <<node_master_ip>>
         infra_config:
-        infra_config:
           expression:
           - <<node_hostname>>__startswith__cfg
           - <<node_cluster>>__equals__os_ha_ovs_syndic
@@ -87,22 +86,30 @@
             cluster_domain:
               value_template: <<node_domain>>
         openstack_control01:
-          expression: <<node_hostname>>__equals__ctl01
+          expression:
+          - <<node_hostname>>__equals__ctl01
+          - <<node_cluster>>__equals__os_ha_ovs_syndic
           cluster_param:
             openstack_control_node01_address:
               value_template: <<node_control_ip>>
         openstack_control02:
-          expression: <<node_hostname>>__equals__ctl02
+          expression:
+          - <<node_hostname>>__equals__ctl02
+          - <<node_cluster>>__equals__os_ha_ovs_syndic
           cluster_param:
             openstack_control_node02_address:
               value_template: <<node_control_ip>>
         openstack_control03:
-          expression: <<node_hostname>>__equals__ctl03
+          expression:
+          - <<node_hostname>>__equals__ctl03
+          - <<node_cluster>>__equals__os_ha_ovs_syndic
           cluster_param:
             openstack_control_node03_address:
               value_template: <<node_control_ip>>
         openstack_compute:
-          expression: <<node_hostname>>__startswith__cmp
+          expression:
+          - <<node_hostname>>__startswith__cmp
+          - <<node_cluster>>__equals__os_ha_ovs_syndic
           node_class:
             value_template:
               - cluster.<<node_cluster>>.openstack.compute
@@ -112,7 +119,9 @@
             external_address:
               value_template: <<node_external_ip>>
         openstack_gateway:
-          expression: <<node_hostname>>__startswith__gtw
+          expression:
+          - <<node_hostname>>__startswith__gtw
+          - <<node_cluster>>__equals__os_ha_ovs_syndic
           node_class:
             value_template:
               - cluster.<<node_cluster>>.openstack.gateway
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
index 5bdbb9a..a9e7f7b 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
@@ -10,6 +10,7 @@
   - system.glusterfs.client.volume.mysql
   - system.glusterfs.client.volume.openldap
   - system.glusterfs.client.volume.postgresql
+  - system.glusterfs.client.volume.prometheus
   - system.glusterfs.client.volume.pushkin
   - system.glusterfs.client.volume.registry
   - system.glusterfs.client.volume.rundeck
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/leader.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/leader.yml
index 28bc297..d4b5fb2 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/leader.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/leader.yml
@@ -45,3 +45,5 @@
 
   - cluster.virtual-mcp-ocata-cicd.infra
   - cluster.virtual-mcp-ocata-cicd.cicd.control
+  - cluster.virtual-mcp-ocata-cicd.stacklight.client
+  - cluster.virtual-mcp-ocata-cicd.stacklight.server
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/manager.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/manager.yml
index 96dfe3d..0f53a66 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/manager.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/manager.yml
@@ -2,3 +2,4 @@
   - system.docker.swarm.manager
   - cluster.virtual-mcp-ocata-cicd.infra
   - cluster.virtual-mcp-ocata-cicd.cicd.control
+  - cluster.virtual-mcp-ocata-cicd.stacklight.server
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
index 082902e..47cd942 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
@@ -9,6 +9,7 @@
   - system.glusterfs.server.volume.mysql
   - system.glusterfs.server.volume.openldap
   - system.glusterfs.server.volume.postgresql
+  - system.glusterfs.server.volume.prometheus
   - system.glusterfs.server.volume.pushkin
   - system.glusterfs.server.volume.registry
   - system.glusterfs.server.volume.rundeck
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
index c04387f..aff7d8b 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
@@ -21,7 +22,6 @@
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.stacklightv2_server_cluster
 - system.reclass.storage.system.cicd_control_cluster
 - cluster.virtual-mcp-ocata-cicd.openstack.proxy
 - cluster.virtual-mcp-ocata-cicd.stacklight.proxy
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
index abc9ecf..7cd5d90 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
@@ -10,10 +10,6 @@
 - system.haproxy.proxy.listen.stacklight.kibana
 - system.haproxy.proxy.listen.stacklight.influxdb
 - service.haproxy.proxy.single
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
-- system.glusterfs.server.cluster
-- system.glusterfs.server.volume.prometheus
 - system.galera.server.cluster
 - system.galera.server.database.grafana
 - system.influxdb.server.single
@@ -54,8 +50,6 @@
     kibana_elasticsearch_host: ${_param:cluster_vip_address}
     # Galera
     openstack_version: newton
-    # Glusterfs
-    glusterfs_service_host: ${_param:stacklight_monitor_address}
     # Grafana
     grafana_database_type: mysql
     grafana_database_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index 025fb95..832a60c 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 02f7a11..a1e70bb 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp11-dvr/infra/config.yml b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
index 8f0eaca..f2020dc 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
index f740414..a456bd2 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/config.yml b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
index e97504a..ed8c765 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg