diff --git a/classes/cluster/k8s_ha_calico/infra/config.yml b/classes/cluster/k8s_ha_calico/infra/config.yml
index a31351f..1eb842b 100644
--- a/classes/cluster/k8s_ha_calico/infra/config.yml
+++ b/classes/cluster/k8s_ha_calico/infra/config.yml
@@ -1,11 +1,10 @@
-alasses:
+classes:
 - system.linux.system.repo.ubuntu
 - system.openssh.client.lab
 - system.salt.master.pkg
 - system.salt.minion.ca.salt_master
 - system.salt.master.api
 - system.salt.minion.cert.k8s_server
-- system.mysql.client
 - system.reclass.storage.salt
 - system.reclass.storage.system.kubernetes_control_cluster
 - cluster.k8s_ha_calico
diff --git a/classes/cluster/k8s_ha_calico/infra/init.yml b/classes/cluster/k8s_ha_calico/infra/init.yml
index d6bda6d..3220d0e 100644
--- a/classes/cluster/k8s_ha_calico/infra/init.yml
+++ b/classes/cluster/k8s_ha_calico/infra/init.yml
@@ -7,7 +7,6 @@
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
 - system.openssh.server.team.k8s_team
-- system.rsyslog.client.single
 parameters:
   _param:
     # infra service addresses
diff --git a/classes/cluster/k8s_ha_calico/kubernetes/init.yml b/classes/cluster/k8s_ha_calico/kubernetes/init.yml
index 7533873..c3c13a4 100644
--- a/classes/cluster/k8s_ha_calico/kubernetes/init.yml
+++ b/classes/cluster/k8s_ha_calico/kubernetes/init.yml
@@ -51,12 +51,6 @@
 
   linux:
     network:
-      resolv:
-        domain: virtual-mcp11-k8s-calico.local
-        options:
-          - ndots:5
-          - timeout:2
-          - attempts:2
       host:
         ctl:
           address: ${_param:kubernetes_control_address}
diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index bef849f..2239712 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -27,10 +27,12 @@
   _param:
     cluster_vip_address: ${_param:stacklight_address}
     cluster_public_host: mon
-    docker_image_alertmanager: alertmanager:latest
-    docker_image_pushgateway: pushgateway:latest
-    docker_image_prometheus: prometheus:latest
-    docker_image_grafana: grafana/grafana:latest
+    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
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
     keepalived_prometheus_vip_password: password
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/server.yml b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
index 9980f3c..bb43c6e 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
@@ -34,12 +34,12 @@
   _param:
     cluster_public_host: mon
     cluster_vip_address: ${_param:stacklight_monitor_address}
-    docker_image_alertmanager: mirantis/alertmanager:latest
-    docker_image_pushgateway: mirantis/pushgateway:latest
-    docker_image_prometheus: mirantis/prometheus:latest
-    docker_image_remote_agent: mirantis/telegraf:latest
-    docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
-    docker_image_grafana: grafana/grafana:latest
+    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
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
     keepalived_prometheus_vip_password: password
diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index 894dc0f..23acc64 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -46,12 +46,12 @@
     grafana_database_type: mysql
     grafana_database_host: ${_param:openstack_database_address}
     grafana_database_password: ${_param:mysql_grafana_password}
-    docker_image_alertmanager: mirantis/alertmanager:latest
-    docker_image_pushgateway: mirantis/pushgateway:latest
-    docker_image_prometheus: mirantis/prometheus:latest
-    docker_image_remote_agent: mirantis/telegraf:latest
-    docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
-    docker_image_grafana: grafana/grafana:latest
+    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
     prometheus_glusterfs_service_host: ${_param:openstack_control_address}
     glusterfs_node01_address: ${_param:openstack_control_node01_address}
     glusterfs_node02_address: ${_param:openstack_control_node02_address}
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 4bcf015..974906b 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
@@ -15,6 +15,7 @@
   - system.glusterfs.client.volume.rundeck
   - system.glusterfs.client.volume.salt_pki
   - system.glusterfs.client.volume.security_monkey
+  - cluster.virtual-mcp-ocata-cicd.cicd.gluster
  #- system.glusterfs.client.volume.salt
   # Docker
   - system.docker.host
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
index 5a1d1a3..082902e 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
@@ -12,4 +12,5 @@
   - system.glusterfs.server.volume.pushkin
   - system.glusterfs.server.volume.registry
   - system.glusterfs.server.volume.rundeck
+  - system.glusterfs.server.volume.salt_pki
   - system.glusterfs.server.volume.security_monkey
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 8517382..5f0bbf7 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -48,12 +48,12 @@
     grafana_database_type: mysql
     grafana_database_host: ${_param:openstack_database_address}
     grafana_database_password: ${_param:mysql_grafana_password}
-    docker_image_alertmanager: mirantis/alertmanager:latest
-    docker_image_pushgateway: mirantis/pushgateway:latest
-    docker_image_prometheus: mirantis/prometheus:latest
-    docker_image_remote_agent: mirantis/telegraf:latest
-    docker_image_remote_collector: mirantis/heka:latest
-    docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
+    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_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
     docker_image_grafana: grafana/grafana:4.3.2
     prometheus_glusterfs_service_host: ${_param:openstack_control_address}
     glusterfs_node01_address: ${_param:openstack_control_node01_address}
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index 4ccdb19..c455526 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -48,12 +48,12 @@
     grafana_database_type: mysql
     grafana_database_host: ${_param:openstack_database_address}
     grafana_database_password: ${_param:mysql_grafana_password}
-    docker_image_alertmanager: mirantis/alertmanager:latest
-    docker_image_pushgateway: mirantis/pushgateway:latest
-    docker_image_prometheus: mirantis/prometheus:latest
-    docker_image_remote_agent: mirantis/telegraf:latest
-    docker_image_remote_collector: mirantis/heka:latest
-    docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
+    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_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
     docker_image_grafana: grafana/grafana:4.3.2
     prometheus_glusterfs_service_host: ${_param:openstack_control_address}
     glusterfs_node01_address: ${_param:openstack_control_node01_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
index a381b5e..626a99d 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
@@ -24,8 +24,9 @@
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
-    kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
-    kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
+    kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
+    kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
+    kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
 
     # switches of addons
     kubernetes_helm_enabled: true
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 6c49533..7720b8c 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -29,11 +29,11 @@
   _param:
     cluster_vip_address: ${_param:stacklight_address}
     cluster_public_host: mon
-    docker_image_alertmanager: mirantis/alertmanager:latest
-    docker_image_pushgateway: mirantis/pushgateway:latest
-    docker_image_prometheus: mirantis/prometheus:latest
-    docker_image_remote_agent: mirantis/telegraf:latest
-    docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
+    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
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
index b82b444..fa0bb5a 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
@@ -43,3 +43,4 @@
           enabled: ${_param:kubernetes_netchecker_enabled}
           agent_image: ${_param:kubernetes_netchecker_agent_image}
           server_image: ${_param:kubernetes_netchecker_server_image}
+          agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
index 61a6be8..06b33d5 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
@@ -23,8 +23,9 @@
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
-    kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:latest
-    kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:latest
+    kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
+    kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
+    kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
 
     # addresses and hostnames
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 7f929d7..58860fa 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -24,8 +24,9 @@
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
-    kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
-    kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
+    kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
+    kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
+    kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
 
     # switches of addons
     kubernetes_helm_enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/proxy.yml
index 49c16f0..1433a95 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/proxy.yml
@@ -1,6 +1,7 @@
 classes:
 - system.nginx.server.single
 - system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 4de8d96..63c1443 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -34,11 +34,11 @@
   _param:
     cluster_vip_address: ${_param:stacklight_monitor_address}
     cluster_public_host: mon
-    docker_image_alertmanager: mirantis/alertmanager:latest
-    docker_image_pushgateway: mirantis/pushgateway:latest
-    docker_image_prometheus: mirantis/prometheus:latest
-    docker_image_remote_agent: mirantis/telegraf:latest
-    docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
+    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
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index a5e197f..dbed35d 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -24,9 +24,11 @@
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
-    kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
-    kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
     kubernetes_virtlet_image: mirantis/virtlet:latest
+    kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
+    kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
+    kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
+    kubernetes_virtlet_image: mirantis/virtlet:v0.7.0
 
     # switches of addons
     kubernetes_helm_enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
index 5c6a269..52b8fbf 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
@@ -1,6 +1,7 @@
 classes:
 - system.nginx.server.single
 - system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index 33033d9..761616f 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -34,11 +34,11 @@
   _param:
     cluster_public_host: mon
     cluster_vip_address: ${_param:stacklight_monitor_address}
-    docker_image_alertmanager: mirantis/alertmanager:latest
-    docker_image_pushgateway: mirantis/pushgateway:latest
-    docker_image_prometheus: mirantis/prometheus:latest
-    docker_image_remote_agent: mirantis/telegraf:latest
-    docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
+    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
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
diff --git a/scripts/bootstrap_all.sh b/scripts/bootstrap_all.sh
index 4e4d248..445464e 100755
--- a/scripts/bootstrap_all.sh
+++ b/scripts/bootstrap_all.sh
@@ -16,9 +16,6 @@
 if [[ "$K8S_BOOTSTRAP" == "true" ]]; then
     "$CWD"/kubernetes_install.sh
 fi
-if [[ "$STACKLIGHTV2_BOOTSTRAP" == "true" ]]; then
-    "$CWD"/stacklightv2_infra_install.sh
-fi
 if [[ "$OPENSTACK_BOOTSTRAP" == "true" ]]; then
     "$CWD"/openstack_control_install.sh
     "$CWD"/stacklight_infra_install.sh
@@ -30,3 +27,6 @@
     fi
     "$CWD"/stacklight_monitor_install.sh
 fi
+if [[ "$STACKLIGHTV2_BOOTSTRAP" == "true" ]]; then
+    "$CWD"/stacklightv2_infra_install.sh
+fi
diff --git a/scripts/stacklightv2_infra_install.sh b/scripts/stacklightv2_infra_install.sh
index 08cb962..8ce538a 100755
--- a/scripts/stacklightv2_infra_install.sh
+++ b/scripts/stacklightv2_infra_install.sh
@@ -14,14 +14,14 @@
 INFLUXDB_SERVICE=$(salt -C 'I@influxdb:server' test.ping 1>/dev/null 2>&1 && echo true)
 
 # Configure Telegraf
-salt -C 'I@telegraf:agent' state.sls telegraf
+salt -C 'I@telegraf:agent or I@telegraf:remote_agent' state.sls telegraf
+
+# Configure log_collector
+salt -C 'I@heka:log_collector' state.sls heka.log_collector
 
 # Configure Elasticsearch/Kibana services
 salt -C 'I@elasticsearch:server' state.sls elasticsearch.server -b 1
 salt -C 'I@kibana:server' state.sls kibana.server -b 1
-salt -C 'I@elasticsearch:client' state.sls elasticsearch.client.service
-salt -C 'I@elasticsearch:client' --async service.restart salt-minion
-sleep 10
 salt -C 'I@elasticsearch:client' state.sls elasticsearch.client
 salt -C 'I@kibana:client' state.sls kibana.client
 
@@ -35,16 +35,14 @@
 salt -C 'I@salt:minion' mine.update
 sleep 5
 
-# Configure the services running in Docker Swarm
-salt -C 'I@docker:swarm' state.sls prometheus.server,prometheus.alertmanager -b 1
-for img in pushgateway alertmanager prometheus telegraf remote_storage_adapter; do
-    salt -C 'I@docker:swarm' dockerng.pull "docker-sandbox.sandbox.mirantis.net/bkupidura/$img"
-    salt -C 'I@docker:swarm' dockerng.tag "docker-sandbox.sandbox.mirantis.net/bkupidura/$img:latest" "mirantis/$img:latest"
-done
+# Generate the configuration for services running in Docker Swarm
+salt -C 'I@docker:swarm' state.sls prometheus,heka.remote_collector -b 1
+
+# Kick off the services in Docker Swarm
 salt -C 'I@docker:swarm:role:master' state.sls docker
 salt -C 'I@docker:swarm' dockerng.ps
 
-# Configure Grafana dashboards and datasources
+# Configure the Grafana dashboards and datasources
 stacklight_vip=$(get_param_value stacklight_monitor_address)
 wait_for_http_service "http://${stacklight_vip}:15013/"
 salt -C 'I@grafana:client' state.sls grafana.client