diff --git a/classes/cluster/virtual-mcp11-contrail/init.yml b/classes/cluster/virtual-mcp11-contrail/init.yml
index 52fdf6f..14b47b2 100755
--- a/classes/cluster/virtual-mcp11-contrail/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/init.yml
@@ -1,9 +1,13 @@
 classes:
 - system.linux.network.dynamic_hosts
 - service.grafana.collector
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
 - system.linux.system.repo.mcp.extra
+- system.linux.system.repo.fluentd
 - system.linux.system.single
 - system.rsyslog.client.single
 - system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
index 50b13ed..c600e35 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
@@ -117,6 +117,8 @@
     mongodb_admin_password: cloudlab
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
     ceilometer_influxdb_password: lmapass
+    openstack_log_appender: true
+    openstack_fluentd_handler_enabled: true
   linux:
     network:
       purge_hosts: true
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
index f30d6e4..f74b8c1 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
@@ -8,7 +8,6 @@
     stacklight_telemetry_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
     prometheus_control_address: ${_param:stacklight_monitor_address}
-    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
     elasticsearch_port: 9200
     stacklight_environment: ${_param:cluster_domain}
     stacklight_notification_topic: stacklight_notifications
@@ -16,6 +15,7 @@
     grafana_database_type: mysql
     grafana_database_host: ${_param:openstack_database_address}
     grafana_database_password: ${_param:mysql_grafana_password}
+    fluentd_elasticsearch_host: ${_param:stacklight_log_address}
   linux:
     network:
       host:
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 818e360..f7fb72d 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -5,10 +5,6 @@
 - system.linux.system.repo.mcp.apt_mirantis.elastic
 - system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.docker
-- system.heka.remote_collector.container
-- system.heka.remote_collector.input.amqp
-- system.heka.remote_collector.output.elasticsearch
-- system.heka.remote_collector.output.telegraf
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
@@ -26,12 +22,10 @@
 - 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:
   _param:
-    heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
@@ -51,7 +45,6 @@
     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_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
     docker_image_grafana: grafana/grafana:4.5.2
     influxdb_port: 8086
@@ -61,7 +54,6 @@
     prometheus_influxdb_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
-    remote_collector_telegraf_host: monitoring_remote_agent
   linux:
     network:
       interface: