diff --git a/classes/cluster/k8s_ha_calico/infra/init.yml b/classes/cluster/k8s_ha_calico/infra/init.yml
index 3220d0e..62922ee 100644
--- a/classes/cluster/k8s_ha_calico/infra/init.yml
+++ b/classes/cluster/k8s_ha_calico/infra/init.yml
@@ -3,10 +3,7 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.ubuntu
-- system.openssh.server.team.lab
-- system.openssh.server.team.tcpcloud
-- system.openssh.server.team.mcp_qa
-- system.openssh.server.team.k8s_team
+- system.openssh.server.team.all
 parameters:
   _param:
     # infra service addresses
diff --git a/classes/cluster/k8s_ha_calico/kubernetes/control.yml b/classes/cluster/k8s_ha_calico/kubernetes/control.yml
index aecac20..c6dd6ab 100644
--- a/classes/cluster/k8s_ha_calico/kubernetes/control.yml
+++ b/classes/cluster/k8s_ha_calico/kubernetes/control.yml
@@ -40,7 +40,7 @@
         netchecker:
           enabled: true
         helm:
-          enabled: true
+          enabled: false
     master:
       etcd:
         ssl:
diff --git a/classes/cluster/k8s_ha_calico/kubernetes/init.yml b/classes/cluster/k8s_ha_calico/kubernetes/init.yml
index 307ebd0..1c4dfda 100644
--- a/classes/cluster/k8s_ha_calico/kubernetes/init.yml
+++ b/classes/cluster/k8s_ha_calico/kubernetes/init.yml
@@ -21,13 +21,9 @@
     kubernetes_control_node01_hostname: ctl01
     kubernetes_control_node02_hostname: ctl02
     kubernetes_control_node03_hostname: ctl03
-    kubernetes_compute_node01_hostname: cmp01
-    kubernetes_compute_node02_hostname: cmp02
     kubernetes_control_node01_address: 172.16.10.101
     kubernetes_control_node02_address: 172.16.10.102
     kubernetes_control_node03_address: 172.16.10.103
-    kubernetes_compute_node01_address: 172.16.10.105
-    kubernetes_compute_node02_address: 172.16.10.106
     kubernetes_proxy_node01_hostname: prx01
     kubernetes_proxy_node01_address: 172.16.10.121
 
@@ -72,21 +68,21 @@
           names:
           - ${_param:kubernetes_control_node03_hostname}
           - ${_param:kubernetes_control_node03_hostname}.${_param:cluster_domain}
-        cmp01:
-          address: ${_param:kubernetes_compute_node01_address}
-          names:
-          - ${_param:kubernetes_compute_node01_hostname}
-          - ${_param:kubernetes_compute_node01_hostname}.${_param:cluster_domain}
-        cmp02:
-          address: ${_param:kubernetes_compute_node02_address}
-          names:
-          - ${_param:kubernetes_compute_node02_hostname}
-          - ${_param:kubernetes_compute_node02_hostname}.${_param:cluster_domain}
         prx01:
           address: ${_param:kubernetes_proxy_node01_address}
           names:
           - ${_param:kubernetes_proxy_node01_hostname}
           - ${_param:kubernetes_proxy_node01_hostname}.${_param:cluster_domain}
+    linux:
+      network:
+        interface:
+          primary_interface:
+            route:
+              # TODO: Remove comment.
+              # Will work once CI has this in linux formula (packaged): https://gerrit.mcp.mirantis.net/#/c/8952
+              kubernetes_internal:
+                address: 10.254.0.0
+                netmask: 255.255.0.0
     system:
       rc:
         local: |
@@ -99,5 +95,4 @@
           # Make sure that the script will "exit 0" on success or any other
           # value on error.
           #
-          ip r a 10.254.0.0/16 dev ens3
           exit 0
diff --git a/classes/cluster/os_aio_contrail/openstack/init.yml b/classes/cluster/os_aio_contrail/openstack/init.yml
index b3a0672..721257a 100755
--- a/classes/cluster/os_aio_contrail/openstack/init.yml
+++ b/classes/cluster/os_aio_contrail/openstack/init.yml
@@ -96,43 +96,8 @@
   linux:
     network:
       host:
-        ctl:
-          address: ${_param:openstack_control_address}
-          names:
-          - ctl
-          - ctl.${_param:cluster_domain}
         ctl01:
           address: ${_param:openstack_control_node01_address}
           names:
           - ${_param:openstack_control_node01_hostname}
           - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
-        msg:
-          address: ${_param:openstack_message_queue_address}
-          names:
-          - msg
-          - msg.${_param:cluster_domain}
-        msg01:
-          address: ${_param:openstack_message_queue_node01_address}
-          names:
-          - ${_param:openstack_message_queue_node01_hostname}
-          - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
-        dbs:
-          address: ${_param:openstack_database_address}
-          names:
-          - dbs
-          - dbs.${_param:cluster_domain}
-        dbs01:
-          address: ${_param:openstack_database_node01_address}
-          names:
-          - ${_param:openstack_database_node01_hostname}
-          - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
-        cmp01:
-          address: ${_param:openstack_compute_node01_address}
-          names:
-          - ${_param:openstack_compute_node01_hostname}
-          - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
-        cmp02:
-          address: ${_param:openstack_compute_node02_address}
-          names:
-          - ${_param:openstack_compute_node02_hostname}
-          - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index 30bb05a..8426444 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -31,6 +31,7 @@
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.dashboard
+- system.docker.swarm.stack.monitoring.remote_collector
 - cluster.sl_k8s_calico
 parameters:
   _param:
@@ -75,6 +76,7 @@
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
     remote_collector_telegraf_host: monitoring_remote_agent
     rabbitmq_openstack_password: workshop
+    heka_amqp_host: ${_param:kubernetes_control_address}
   elasticsearch:
     server:
       heap:
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/server.yml b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
index f23432e..8ab8491 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
@@ -67,6 +67,8 @@
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
     remote_collector_telegraf_host: monitoring_remote_agent
+    rabbitmq_openstack_password: workshop
+    heka_amqp_host: ${_param:kubernetes_control_address}
   elasticsearch:
     server:
       heap:
diff --git a/classes/cluster/sl_os_contrail/infra/config.yml b/classes/cluster/sl_os_contrail/infra/config.yml
index 8d5a4ae..e3c77d4 100755
--- a/classes/cluster/sl_os_contrail/infra/config.yml
+++ b/classes/cluster/sl_os_contrail/infra/config.yml
@@ -174,21 +174,7 @@
             single_address: ${_param:stacklight_monitor_node01_address}
             keepalived_vip_priority: 100
             mysql_cluster_role: master
-        openstack_control_node01:
-          name: ${_param:stacklight_monitor_node01_hostname}
-          domain: ${_param:cluster_domain}
-          classes:
-          - service.galera.master.cluster
-          - 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:stacklight_monitor_node01_address}
-            keepalived_vip_priority: 100
-            mysql_cluster_role: master
-        openstack_control_node02:
+        stacklight_monitor_node02:
           name: ${_param:stacklight_monitor_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
@@ -201,7 +187,7 @@
             single_address: ${_param:stacklight_monitor_node02_address}
             keepalived_vip_priority: 101
             mysql_cluster_role: slave
-        openstack_control_node03:
+        stacklight_monitor_node03:
           name: ${_param:stacklight_monitor_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
@@ -214,3 +200,12 @@
             single_address: ${_param:stacklight_monitor_node03_address}
             keepalived_vip_priority: 102
             mysql_cluster_role: slave
+        opencontrail_control_node01:
+          params:
+            rabbitmq_cluster_role: master
+        opencontrail_control_node02:
+          params:
+            rabbitmq_cluster_role: slave
+        opencontrail_control_node03:
+          params:
+            rabbitmq_cluster_role: slave
\ No newline at end of file
diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index 29d0809..a4a90b2 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -67,6 +67,7 @@
     influxdb_stacklight_password: lmapass
     openstack_version: newton
     remote_collector_telegraf_host: monitoring_remote_agent
+    heka_amqp_host: ${_param:openstack_control_address}
   linux:
     network:
       interface:
diff --git a/classes/cluster/sl_os_ovs/stacklight/client.yml b/classes/cluster/sl_os_ovs/stacklight/client.yml
index 3ca0f10..9d5bb82 100644
--- a/classes/cluster/sl_os_ovs/stacklight/client.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/client.yml
@@ -17,3 +17,4 @@
     grafana_password: ${_param:grafana_admin_password}
     grafana_prometheus_address: ${_param:stacklight_monitor_address}
     grafana_prometheus_port: 15010
+    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
diff --git a/classes/cluster/sl_os_ovs/stacklight/server.yml b/classes/cluster/sl_os_ovs/stacklight/server.yml
index fd5a54b..e5e2cc6 100644
--- a/classes/cluster/sl_os_ovs/stacklight/server.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/server.yml
@@ -21,11 +21,11 @@
 - system.telegraf.agent.remote
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.kubernetes
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.dashboard
 - system.docker.swarm.stack.monitoring.remote_collector
+- cluster.sl_os_ovs.stacklight.client
 - cluster.sl_os_ovs
 parameters:
   _param:
diff --git a/classes/system b/classes/system
index dd3848d..9b85a38 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit dd3848d8bd94040044f2c5fa1724640c56195333
+Subproject commit 9b85a38800599124dfe4118d9bb007eee52b6932