diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml
index 57858ea7e5..3cc93e97f7 100644
--- a/roles/rabbitmq_cluster/tasks/main.yml
+++ b/roles/rabbitmq_cluster/tasks/main.yml
@@ -49,7 +49,10 @@
   - config
 
 - name: deploy configuration
-  template: src=rabbitmq.config dest=/etc/rabbitmq/rabbitmq.config owner=root group=root mode=0644
+  template: src={{item}} dest=/etc/rabbitmq/{{item}} owner=root group=root mode=0644
+  with_items:
+  - rabbitmq.config
+  - rabbitmq-env.conf
   tags:
   - rabbitmq_cluster
   - config
diff --git a/roles/rabbitmq_cluster/templates/rabbitmq-env.conf b/roles/rabbitmq_cluster/templates/rabbitmq-env.conf
new file mode 100644
index 0000000000..e69de29bb2