diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 245de1c..8517382 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -4,9 +4,10 @@
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.tcp_elastic
-- system.heka.remote_collector
+- system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
 - system.heka.remote_collector.output.elasticsearch
+- system.heka.remote_collector.output.telegraf
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.prometheus
 - system.elasticsearch.server.cluster
@@ -24,6 +25,7 @@
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp11-contrail
 parameters:
@@ -50,6 +52,7 @@
     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_grafana: grafana/grafana:4.3.2
     prometheus_glusterfs_service_host: ${_param:openstack_control_address}
@@ -63,6 +66,7 @@
     prometheus_influxdb_db: lma
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+    remote_collector_telegraf_host: monitoring_remote_agent
   linux:
     network:
       interface:
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index 4243f6c..4ccdb19 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -4,9 +4,10 @@
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.tcp_elastic
-- system.heka.remote_collector
+- system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
 - system.heka.remote_collector.output.elasticsearch
+- system.heka.remote_collector.output.telegraf
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.prometheus
 - system.elasticsearch.server.cluster
@@ -24,6 +25,7 @@
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp11-dvr
 parameters:
@@ -50,6 +52,7 @@
     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_grafana: grafana/grafana:4.3.2
     prometheus_glusterfs_service_host: ${_param:openstack_control_address}
@@ -63,6 +66,7 @@
     prometheus_influxdb_db: lma
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+    remote_collector_telegraf_host: monitoring_remote_agent
   linux:
     network:
       interface: