diff --git a/heka/remote_collector/cluster.yml b/heka/remote_collector/cluster.yml
index 3da60c1..7669bcf 100644
--- a/heka/remote_collector/cluster.yml
+++ b/heka/remote_collector/cluster.yml
@@ -11,12 +11,6 @@
       influxdb_password: ${_param:influxdb_password}
       aggregator_host: ${_param:heka_aggregator_host}
       aggregator_port: ${_param:aggregator_port}
-      amqp_host: ${_param:heka_amqp_host}
-      amqp_port: 5672
-      amqp_user: openstack
-      amqp_password: ${_param:rabbitmq_openstack_password}
-      amqp_vhost: '/openstack'
-      amqp_notification_topic: notifications
       elasticsearch_host: ${_param:heka_elasticsearch_host}
       elasticsearch_port: ${_param:elasticsearch_port}
   keepalived:
diff --git a/heka/remote_collector/input/amqp.yml b/heka/remote_collector/input/amqp.yml
new file mode 100644
index 0000000..fecd09b
--- /dev/null
+++ b/heka/remote_collector/input/amqp.yml
@@ -0,0 +1,9 @@
+parameters:
+  heka:
+    remote_collector:
+      amqp_host: ${_param:heka_amqp_host}
+      amqp_port: 5672
+      amqp_user: openstack
+      amqp_password: ${_param:rabbitmq_openstack_password}
+      amqp_vhost: '/openstack'
+      amqp_notification_topic: notifications
diff --git a/heka/remote_collector/single.yml b/heka/remote_collector/single.yml
index 9511fd6..7b4050e 100644
--- a/heka/remote_collector/single.yml
+++ b/heka/remote_collector/single.yml
@@ -11,11 +11,5 @@
       influxdb_password: ${_param:influxdb_password}
       aggregator_host: ${_param:heka_aggregator_host}
       aggregator_port: ${_param:aggregator_port}
-      amqp_host: ${_param:heka_amqp_host}
-      amqp_port: 5672
-      amqp_user: openstack
-      amqp_password: ${_param:rabbitmq_openstack_password}
-      amqp_vhost: '/openstack'
-      amqp_notification_topic: notifications
       elasticsearch_host: ${_param:heka_elasticsearch_host}
       elasticsearch_port: ${_param:elasticsearch_port}