diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
index 4c68509..979b08d 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/server.yml
@@ -24,7 +24,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.dashboard
 - cluster.sl-k8s-calico
 parameters:
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/server.yml b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
index 5464309..a9ae634 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
@@ -24,7 +24,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.dashboard
 - cluster.sl-k8s-contrail.infra
 parameters:
diff --git a/classes/cluster/sl-os-contrail/stacklight/server.yml b/classes/cluster/sl-os-contrail/stacklight/server.yml
index a834c6d..f67f8dd 100755
--- a/classes/cluster/sl-os-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/server.yml
@@ -20,7 +20,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.dashboard
 - system.docker.swarm.stack.monitoring.remote_collector
 - cluster.sl-os-contrail
diff --git a/classes/cluster/sl-os-ovs/stacklight/server.yml b/classes/cluster/sl-os-ovs/stacklight/server.yml
index f5e9153..019e4b3 100644
--- a/classes/cluster/sl-os-ovs/stacklight/server.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/server.yml
@@ -22,7 +22,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.dashboard
 - system.docker.swarm.stack.monitoring.remote_collector
 - cluster.sl-os-ovs.stacklight.client
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-dvr/stacklight/server.yml
index 242a83e..f65ab4c 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/stacklight/server.yml
@@ -21,7 +21,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp-mitaka-dvr
 parameters:
diff --git a/classes/cluster/virtual-mcp-newton-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-newton-dvr/stacklight/server.yml
index 0aa1fc0..f8444d9 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/stacklight/server.yml
@@ -21,7 +21,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp-newton-dvr
 parameters:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/server.yml
index 65cfd41..8a077e5 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/server.yml
@@ -24,7 +24,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp-ocata-dvr-ceph-local
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
index 586cad0..3e8887c 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
@@ -25,7 +25,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp-ocata-dvr
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/server.yml
index 680d695..ab0817a 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/server.yml
@@ -24,7 +24,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp-ocata-ovs-ceph-local
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml
index 9b08d06..0c56d52 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml
@@ -24,7 +24,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp-ocata-ovs-ceph
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
index 247ed14..ce7f493 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
@@ -25,7 +25,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp-ocata-ovs
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
index e11bc04..a21572d 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
@@ -24,7 +24,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp-pike-dvr-ceph-rgw
diff --git a/classes/cluster/virtual-mcp-pike-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-dvr/stacklight/server.yml
index 9ea9b92..1714106 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/stacklight/server.yml
@@ -26,7 +26,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp-pike-dvr
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml
index 638305d..fb55453 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml
@@ -24,7 +24,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp-pike-ovs-ceph
diff --git a/classes/cluster/virtual-mcp-pike-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-ovs/stacklight/server.yml
index d238e21..f1631aa 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/stacklight/server.yml
@@ -25,7 +25,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp-pike-ovs
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 818e360..61dfbf0 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -25,7 +25,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp11-contrail
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index d151d16..f529bc6 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -25,7 +25,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp11-dvr
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 a1bcd3d..f17b9bb 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -18,7 +18,7 @@
 - system.telegraf.agent.remote
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp11-k8s-calico-dyn
 parameters:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 2ec9276..e8895b3 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -24,7 +24,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp11-k8s-calico
 parameters:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index 90f53cf..3b76c3f 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -24,7 +24,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp11-k8s-contrail.infra
 parameters:
diff --git a/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml b/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
index e0da677..e9f6bcb 100644
--- a/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
@@ -25,7 +25,7 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-offline-pike-ovs