diff --git a/classes/cluster/drivetrain_ha/bootstrap_vars b/classes/cluster/drivetrain_ha/bootstrap_vars
new file mode 100644
index 0000000..481bf83
--- /dev/null
+++ b/classes/cluster/drivetrain_ha/bootstrap_vars
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(glusterfs docker aptly keepalived rundeck)
diff --git a/classes/cluster/drivetrain_ha/cicd/control/init.yml b/classes/cluster/drivetrain_ha/cicd/control/init.yml
index 6fb78de..619db7b 100644
--- a/classes/cluster/drivetrain_ha/cicd/control/init.yml
+++ b/classes/cluster/drivetrain_ha/cicd/control/init.yml
@@ -90,7 +90,8 @@
   # Rundeck
   - system.rundeck.client.runbook
 
-  - cluster.drivetrain_ha
+ # - cluster.drivetrain_ha.cicd
+ # - cluster.drivetrain_ha
 parameters:
   _param:
     cluster_node01_name: ci01
diff --git a/classes/cluster/drivetrain_ha/cicd/init.yml b/classes/cluster/drivetrain_ha/cicd/init.yml
index 816b66f..9b736f2 100644
--- a/classes/cluster/drivetrain_ha/cicd/init.yml
+++ b/classes/cluster/drivetrain_ha/cicd/init.yml
@@ -1,6 +1,11 @@
 parameters:
   _param:
+    cluster_public_host: ${_param:cicd_control_address}
     cicd_control_address: 172.16.10.254
+    cicd_control_hostname: cid
+    cicd_control_node01_hostname: cid01
+    cicd_control_node02_hostname: cid02
+    cicd_control_node03_hostname: cid03
     cicd_control_node01_address: 172.16.10.11
     cicd_control_node02_address: 172.16.10.12
     cicd_control_node03_address: 172.16.10.13
diff --git a/classes/cluster/drivetrain_ha/infra/config.yml b/classes/cluster/drivetrain_ha/infra/config.yml
index fbad093..a536168 100644
--- a/classes/cluster/drivetrain_ha/infra/config.yml
+++ b/classes/cluster/drivetrain_ha/infra/config.yml
@@ -22,6 +22,12 @@
       reactor:
         reclass/minion/classify:
         - salt://reclass/reactor/node_register.sls
+      environment:
+        prd:
+          formula:
+            glusterfs:
+              source: pkg
+              name: salt-formula-glusterfs
   linux:
     network:
       interface:
diff --git a/classes/cluster/drivetrain_ha/init.yml b/classes/cluster/drivetrain_ha/init.yml
index 1a37367..d80e58b 100644
--- a/classes/cluster/drivetrain_ha/init.yml
+++ b/classes/cluster/drivetrain_ha/init.yml
@@ -1,5 +1,6 @@
 classes:
 - cluster.drivetrain_ha.infra
 - cluster.drivetrain_ha.cicd
+- cluster.drivetrain_ha.cicd.control
 - cluster.overrides
 
diff --git a/classes/cluster/k8s_ha_calico/MAINTAINERS b/classes/cluster/k8s_ha_calico/MAINTAINERS
new file mode 100644
index 0000000..3c56b7b
--- /dev/null
+++ b/classes/cluster/k8s_ha_calico/MAINTAINERS
@@ -0,0 +1 @@
+Tomáš Kukrál <tkukral@mirantis.com
diff --git a/classes/cluster/k8s_ha_contrail/MAINTAINERS b/classes/cluster/k8s_ha_contrail/MAINTAINERS
new file mode 100644
index 0000000..3c56b7b
--- /dev/null
+++ b/classes/cluster/k8s_ha_contrail/MAINTAINERS
@@ -0,0 +1 @@
+Tomáš Kukrál <tkukral@mirantis.com
diff --git a/classes/cluster/sl_os_ovs/stacklight/client.yml b/classes/cluster/sl_os_ovs/stacklight/client.yml
index d0ebb16..393449c 100644
--- a/classes/cluster/sl_os_ovs/stacklight/client.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/client.yml
@@ -1,6 +1,17 @@
 classes:
-- system.collectd.client.output.heka
-- system.heka.log_collector.single
-- system.heka.metric_collector.single
-- cluster.sl_os_ovs.stacklight
-- service.grafana.collector
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+parameters:
+  _param:
+    # Elasticsearch/Kibana client parameters
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    # Grafana client parameters
+    grafana_address: ${_param:stacklight_monitor_address}
+    grafana_port: 15013
+    grafana_user: admin
+    grafana_password: ${_param:grafana_admin_password}
+    grafana_prometheus_address: ${_param:stacklight_monitor_address}
+    grafana_prometheus_port: 15010
diff --git a/classes/cluster/sl_os_ovs/stacklight/init.yml b/classes/cluster/sl_os_ovs/stacklight/init.yml
index 9621aa3..3b0c8bc 100644
--- a/classes/cluster/sl_os_ovs/stacklight/init.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/init.yml
@@ -1,36 +1,31 @@
 parameters:
   _param:
-    stacklight_monitor_address: 172.16.10.253
+    stacklight_monitor_address: 172.16.10.252
+    stacklight_monitor_node01_hostname: mon01
+    stacklight_monitor_node02_hostname: mon02
+    stacklight_monitor_node03_hostname: mon03
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+
+    # Glusterfs
+    glusterfs_service_host: ${_param:stacklight_monitor_address}
+
+    # Prometheus
+    prometheus_control_address: ${_param:stacklight_monitor_address}
+
+    mysql_admin_user: root
+    mysql_admin_password: workshop
+
+    mysql_grafana_password: password
+    cluster_local_address: ${_param:single_address}
+    galera_server_cluster_name: monitoring_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
 
     heka_elasticsearch_host: ${_param:stacklight_monitor_address}
-    heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
-    heka_aggregator_host: ${_param:stacklight_monitor_address}
-    aggregator_port: 5565
-    grafana_user: admin
-    grafana_password: password
-    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
     elasticsearch_port: 9200
-    influxdb_stacklight_password: lmapass
-    influxdb_admin_password: password
-    influxdb_port: 8086
-    influxdb_database: lma
-    influxdb_user: lma
-    influxdb_password: lmapass
-    nagios_host: ${_param:stacklight_monitor_address}
-    nagios_status_port: 8001
-    nagios_username: nagiosadmin
-    nagios_password: secret
-    nagios_notification_smtp_server: 127.0.0.1
-    nagios_notification_from: 'nagios@localhost'
-    nagios_notification_email: 'root@localhost'
     stacklight_environment: ${_param:cluster_domain}
-    stacklight_notification_topic: stacklight_notifications
   linux:
     network:
       host:
@@ -42,15 +37,15 @@
         mon01:
           address: ${_param:stacklight_monitor_node01_address}
           names:
-          - mon01
-          - mon01.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node01_hostname}
+          - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
         mon02:
           address: ${_param:stacklight_monitor_node02_address}
           names:
-          - mon02
-          - mon02.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node02_hostname}
+          - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
         mon03:
           address: ${_param:stacklight_monitor_node03_address}
           names:
-          - mon03
-          - mon03.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node03_hostname}
+          - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/sl_os_ovs/stacklight/server.yml b/classes/cluster/sl_os_ovs/stacklight/server.yml
index 4466fd8..351337d 100644
--- a/classes/cluster/sl_os_ovs/stacklight/server.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/server.yml
@@ -9,13 +9,14 @@
 - system.elasticsearch.server.curator
 - system.kibana.server.single
 - system.grafana.server.single
-- system.nagios.server.cluster
 - cluster.sl_os_ovs
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
 - system.haproxy.proxy.listen.stacklight.grafana
 - service.haproxy.proxy.single
 - system.keepalived.cluster.instance.stacklight_monitor_vip
+- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.dashboard
 parameters:
   _param:
     collectd_remote_collector_host: ${_param:stacklight_monitor_address}
@@ -34,12 +35,13 @@
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
     cluster_node03_name: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
-  linux:
-    network:
-      interface:
-        ens4:
-          enabled: true
-          type: eth
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
+    docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+    docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
+    docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
+    docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
+    docker_image_grafana: grafana/grafana:4.3.2
+  elasticsearch:
+    server:
+      heap:
+        size: 1
diff --git a/classes/cluster/virtual-mcp11-aio/.env b/classes/cluster/virtual-mcp11-aio/.env
new file mode 100644
index 0000000..b50fd3a
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio/.env
@@ -0,0 +1,2 @@
+FORMULAS_SALT_MASTER+=(mysql grafana libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate)
+formula_services+=(${formula_services[@]} ${FORMULAS_SALT_MASTER[@]})
diff --git a/classes/cluster/virtual-mcp11-aio/infra/config.yml b/classes/cluster/virtual-mcp11-aio/infra/config.yml
new file mode 100644
index 0000000..37f1323
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio/infra/config.yml
@@ -0,0 +1,10 @@
+classes:
+  - cluster.virtual-mcp11-aio
+parameters:
+  _param:
+    linux_system_codename: xenial
+    apt_mk_version: stable
+  linux:
+    system:
+      name: cfg01
+      domain: ${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index d0c5f40..d72518e 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -20,15 +20,17 @@
     reclass_data_revision: master
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
-    reclass_config_master: 192.168.10.100
-    single_address: 172.16.10.100
+    reclass_config_master: 192.168.10.90
+    single_address: 172.16.10.90
+    infra_config_address: ${_param:single_address}
+    cluster_domain: virtual-mcp11-aio.local
 
     mysql_admin_user: root
     mysql_admin_password: workshop
     rabbitmq_secret_key: workshop
     rabbitmq_admin_password: workshop
     loopback_device_size: 10
-    salt_master_host: 192.168.10.100
+    salt_master_host: 192.168.10.90
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/MAINTAINERS b/classes/cluster/virtual-mcp11-k8s-calico/MAINTAINERS
new file mode 100644
index 0000000..3c56b7b
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico/MAINTAINERS
@@ -0,0 +1 @@
+Tomáš Kukrál <tkukral@mirantis.com
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/MAINTAINERS b/classes/cluster/virtual-mcp11-k8s-contrail/MAINTAINERS
new file mode 100644
index 0000000..3c56b7b
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/MAINTAINERS
@@ -0,0 +1 @@
+Tomáš Kukrál <tkukral@mirantis.com
diff --git a/classes/system b/classes/system
index be1bc7b..9f2c559 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit be1bc7be3d43107a8d0fd747fb432bce34f16d30
+Subproject commit 9f2c5596c833df0f9c72033bd6d6ae39d5f2fa81
diff --git a/nodes/cfg01.virtual-mcp11-aio.local.yml b/nodes/cfg01.virtual-mcp11-aio.local.yml
index d1e5865..88f3267 100644
--- a/nodes/cfg01.virtual-mcp11-aio.local.yml
+++ b/nodes/cfg01.virtual-mcp11-aio.local.yml
@@ -1,13 +1,6 @@
 classes:
 - system.linux.system.single
-- cluster.virtual-mcp11-aio
+- cluster.virtual-mcp11-aio.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
-    apt_mk_version: nightly
-    salt_master_host: 127.0.0.1
-    single_address: 127.0.0.1
-  linux:
-    system:
-      name: cfg01
-      domain: virtual-mcp11-aio.local