diff --git a/README.rst b/README.rst
index 6d463cb..2aaef14 100644
--- a/README.rst
+++ b/README.rst
@@ -155,10 +155,11 @@
         influxdb_time_precision: ms
         influxdb_username: lma
         resource_decoding: false
-        rabbit_host: 172.16.10.253
-        rabbit_port: 5672
-        rabbit_queue: metering.sample
-        rabbit_vhost: /openstack
+        amqp_exchange: ceilometer
+        amqp_host: 172.16.10.253
+        amqp_port: 5672
+        amqp_queue: metering.sample
+        amqp_vhost: /openstack
 
 Default values:
 
@@ -169,9 +170,10 @@
 * ``influxdb_time_precision: ms``
 * ``influxdb_timeout: 5000``
 * ``poolsize: 100``
-* ``rabbit_port: 5672``
-* ``rabbit_vhost: /openstack``
-* ``rabbit_queue: metering.sample``
+* ``amqp_exchange: ceilometer``
+* ``amqp_port: 5672``
+* ``amqp_queue: metering.sample``
+* ``amqp_vhost: /openstack``
 * ``resource_decoding: false``
 
 Read more
diff --git a/heka/map.jinja b/heka/map.jinja
index 2e47090..1677ffc 100644
--- a/heka/map.jinja
+++ b/heka/map.jinja
@@ -39,11 +39,6 @@
 {% set default_nagios_host_alarm_clusters = '00-clusters' %}
 {% set default_automatic_starting = True %}
 {% set default_amqp_port = 5672 %}
-{% set default_amqp_vhost = '' %}
-
-{% set default_rabbit_port = 5672 %}
-{% set default_rabbit_vhost = '/openstack' %}
-{% set default_ceilometer_rabbit_queue = 'metering.sample' %}
 
 {% set log_collector = salt['grains.filter_by']({
   'default': {
@@ -70,7 +65,7 @@
 {% set remote_collector = salt['grains.filter_by']({
   'default': {
     'amqp_port': default_amqp_port,
-    'amqp_vhost': default_amqp_vhost,
+    'amqp_vhost': '',
     'elasticsearch_port': default_elasticsearch_port,
     'influxdb_port': default_influxdb_port,
     'influxdb_time_precision': default_influxdb_time_precision,
@@ -99,9 +94,9 @@
     'influxdb_timeout': default_influxdb_timeout,
     'influxdb_time_precision': default_influxdb_time_precision,
     'elasticsearch_port': default_elasticsearch_port,
-    'rabbit_port': default_rabbit_port,
-    'rabbit_vhost': default_rabbit_vhost,
-    'rabbit_queue': default_ceilometer_rabbit_queue,
+    'amqp_port': default_amqp_port,
+    'amqp_vhost': '/openstack',
+    'amqp_queue': 'metering.sample',
     'resource_decoding': False,
     'poolsize': 100,
     'automatic_starting': default_automatic_starting,
diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index a7c8d32..4a92245 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -42,11 +42,6 @@
       host: {{ log_collector.metric_collector_host }}
       port: {{ log_collector.metric_collector_port }}
       message_matcher: "(Type == 'metric' || Type == 'heka.sandbox.metric' || Type == 'heka.sandbox.bulk_metric')"
-    log_dashboard:
-      engine: dashboard
-      host: 127.0.0.1
-      port: 4352
-      ticker_interval: 30
 {%- if log_collector.elasticsearch_host is defined %}
     elasticsearch:
       engine: elasticsearch
@@ -83,12 +78,6 @@
       decoder: metric_decoder
       splitter: HekaFramingSplitter
   filter:
-    heka_metric_collector:
-      engine: sandbox
-      module_file: /usr/share/lma_collector/filters/heka_monitoring.lua
-      module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
-      preserve_data: false
-      message_matcher: "Type == 'heka.all-report'"
 {%- if metric_collector.influxdb_host is defined %}
     influxdb_accumulator:
       engine: sandbox
@@ -115,11 +104,6 @@
       module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
 {%- endif %}
   output:
-    metric_dashboard:
-      engine: dashboard
-      host: 127.0.0.1
-      port: 4353
-      ticker_interval: 30
 {%- if metric_collector.influxdb_host is defined %}
     influxdb:
       engine: http
@@ -233,11 +217,6 @@
 {%- endif %}
 {%- endif %}
   output:
-    remote_collector_dashboard:
-      engine: dashboard
-      host: 127.0.0.1
-      port: 4354
-      ticker_interval: 30
 {%- if remote_collector.influxdb_host is defined %}
     influxdb:
       engine: http
@@ -483,6 +462,7 @@
 {%- endif %}
 ceilometer_collector:
   decoder:
+{%- if ceilometer_collector.amqp_host is defined %}
     sample:
       engine: sandbox
       module_file: /usr/share/lma_collector/decoders/metering.lua
@@ -491,21 +471,22 @@
         decoder: 'ceilometer'
         decode_resources: {{ ceilometer_collector.resource_decoding|lower }}
         metadata_fields: "status deleted container_format min_ram updated_at min_disk is_public size checksum created_at disk_format protected instance_host host display_name instance_id instance_type status state user_metadata.stack"
+{%- endif %}
   input:
-{%- if ceilometer_collector.rabbit_host is defined %}
+{%- if ceilometer_collector.amqp_host is defined %}
     openstack_sample_amqp:
       engine: amqp
-      user: {{ ceilometer_collector.rabbit_user }}
-      password: {{ ceilometer_collector.rabbit_password }}
-      port: {{ ceilometer_collector.rabbit_port }}
-      host: {{ ceilometer_collector.rabbit_host }}
-      vhost: {{ ceilometer_collector.rabbit_vhost }}
-      queue: {{ ceilometer_collector.rabbit_queue }}
-      routing_key: {{ ceilometer_collector.rabbit_queue }}
+      user: {{ ceilometer_collector.amqp_user }}
+      password: {{ ceilometer_collector.amqp_password }}
+      port: {{ ceilometer_collector.amqp_port }}
+      host: {{ ceilometer_collector.amqp_host }}
+      vhost: {{ ceilometer_collector.amqp_vhost }}
+      queue: {{ ceilometer_collector.amqp_queue }}
+      routing_key: {{ ceilometer_collector.amqp_queue }}
       decoder: sample_decoder
       splitter: NullSplitter
-      exchange: "ceilometer"
-      exchange_type: "topic"
+      exchange: {{ ceilometer_collector.get('amqp_exchange', 'ceilometer') }}
+      exchange_type: topic
       exchange_auto_delete: false
       queue_auto_delete: false
 {%- endif %}