diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
index 29cc1c5..4077b40 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
@@ -44,44 +44,44 @@
           name: ${_param:kubernetes_proxy_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.monitoring.proxy
+          - cluster.${_param:cluster_name}.stacklight.proxy
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
             single_address: ${_param:kubernetes_proxy_node01_address}
-        docker_swarm_node01:
-          name: ${_param:docker_swarm_node01_hostname}
+        stacklight_node01:
+          name: ${_param:stacklight_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.swarm.master
-          - cluster.${_param:cluster_name}.monitoring.client
-          - cluster.${_param:cluster_name}.monitoring.server
+          - system.docker.swarm.master
+          - cluster.${_param:cluster_name}.stacklight.client
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:docker_swarm_node01_address}
+            single_address: ${_param:stacklight_node01_address}
             keepalived_vip_priority: 100
-        docker_swarm_node02:
-          name: ${_param:docker_swarm_node02_hostname}
+        stacklight_node02:
+          name: ${_param:stacklight_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.swarm.slave
-          - cluster.${_param:cluster_name}.monitoring.server
+          - system.docker.swarm.manager
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:docker_swarm_node02_address}
+            single_address: ${_param:stacklight_node02_address}
             keepalived_vip_priority: 101
-        docker_swarm_node03:
-          name: ${_param:docker_swarm_node03_hostname}
+        stacklight_node03:
+          name: ${_param:stacklight_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.swarm.slave
-          - cluster.${_param:cluster_name}.monitoring.server
+          - system.docker.swarm.manager
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:docker_swarm_node03_address}
+            single_address: ${_param:stacklight_node03_address}
             keepalived_vip_priority: 102
         opencontrail_control_node01:
           params:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index 634f0f3..4cfe566 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -10,14 +10,14 @@
 - system.openssh.server.team.k8s_team
 - system.rsyslog.client.single
 - system.telegraf.agent
+- system.prometheus.collector
+- service.grafana.collector
 - cluster.virtual-mcp11-k8s-contrail.kubernetes
 - cluster.virtual-mcp11-k8s-contrail.opencontrail
-- cluster.virtual-mcp11-k8s-calico.monitoring
-- cluster.virtual-mcp11-k8s-calico.swarm
+- cluster.virtual-mcp11-k8s-contrail.stacklight
 - cluster.overwrite
 parameters:
   _param:
-
     # infra service addresses
     infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100