diff --git a/ansible/roles/message-broker/templates/rabbitmq-env.conf.j2 b/ansible/roles/message-broker/templates/rabbitmq-env.conf.j2
index 8921f227e4..555f94dc1f 100644
--- a/ansible/roles/message-broker/templates/rabbitmq-env.conf.j2
+++ b/ansible/roles/message-broker/templates/rabbitmq-env.conf.j2
@@ -1 +1,2 @@
 RABBITMQ_NODENAME=rabbit
+export ERL_EPMD_ADDRESS={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
diff --git a/ansible/roles/message-broker/templates/rabbitmq.config.j2 b/ansible/roles/message-broker/templates/rabbitmq.config.j2
index e51d0c56dd..47ba09e858 100644
--- a/ansible/roles/message-broker/templates/rabbitmq.config.j2
+++ b/ansible/roles/message-broker/templates/rabbitmq.config.j2
@@ -1,9 +1,24 @@
 [
+  {kernel, [
+    {inet_dist_use_interface, {% raw %}{{% endraw %}{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] | regex_replace('\.', ',') }}}}
+  ]},
   {rabbit, [
-    {cluster_nodes, [{% for host in groups['database'] %}'rabbit@{{ hostvars[host]['ansible_hostname'] }}'{% if not loop.last %},{% endif %}{% endfor %}]},
+    {tcp_listeners, [
+      {"{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}", 5672}
+    ]},
     {default_user, <<"{{ rabbitmq_user }}">>},
-    {default_pass, <<"{{ rabbitmq_password }}">>}
+    {default_pass, <<"{{ rabbitmq_password }}">>},
+    {cluster_partition_handling, autoheal},
+    {cluster_nodes, [
+      {% for host in groups['database'] %}'rabbit@{{ hostvars[host]['ansible_hostname'] }}'{% if not loop.last %},{% endif %}{% endfor %}
+
+    ]}
+  ]},
+  {rabbitmq_management, [
+    {listener, [
+      {ip, "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"},
+      {port, 15672}
+    ]}
   ]}
 ].
 % EOF
-