diff --git a/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
index addadca9c55cb6da96dca4dd644d82c9e9d16e61..d0a9fe0dc538217b6310c28bdbee7fd52323bb3b 100644
--- a/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
+++ b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
@@ -1,4 +1,4 @@
-RABBITMQ_NODENAME=rabbit
+RABBITMQ_NODENAME=rabbit@{{ ansible_hostname }}
 RABBITMQ_BOOT_MODULE=rabbit_clusterer
 RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-pa /usr/lib/rabbitmq/lib/{{ rabbitmq_version }}"