diff --git a/classes/cluster/sl_k8s_calico/stacklight/client.yml b/classes/cluster/sl_k8s_calico/stacklight/client.yml
index f27aece..5fd4043 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/client.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/client.yml
@@ -1,4 +1,5 @@
 classes:
+- system.docker.client
 - system.elasticsearch.client.single
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index 6eed190..4295be4 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -30,10 +30,6 @@
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.dashboard
-- system.docker.swarm.stack.monitoring.remote_collector
-- system.heka.remote_collector.container
-- system.heka.remote_collector.output.elasticsearch
-- system.heka.remote_collector.output.telegraf
 - cluster.sl_k8s_calico
 parameters:
   _param:
@@ -43,7 +39,6 @@
     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_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka: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
     docker_influxdb_image: influxdb:1.2
@@ -76,7 +71,6 @@
     prometheus_influxdb_db: prometheus
     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:
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/client.yml b/classes/cluster/sl_k8s_contrail/stacklight/client.yml
index 0f45d40..6cb2915 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/client.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/client.yml
@@ -1,4 +1,5 @@
 classes:
+- system.docker.client
 - system.elasticsearch.client.single
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/server.yml b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
index 09016f0..8b30a14 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
@@ -26,7 +26,6 @@
 - 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_contrail.infra
 parameters:
   _param:
@@ -36,7 +35,6 @@
     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_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka: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
@@ -65,7 +63,6 @@
     prometheus_influxdb_db: prometheus
     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: