diff --git a/roles/rabbitmq/tasks/main.yml b/roles/rabbitmq/tasks/main.yml
index f49697d..4a8a285 100644
--- a/roles/rabbitmq/tasks/main.yml
+++ b/roles/rabbitmq/tasks/main.yml
@@ -16,9 +16,10 @@
     name: rabbitmq.service
     state: started
 
-    #- name: setup the cluster
-    #  command: "docker exec -i rabbitmq.service {{ item }}"
-    #  with_items:
-    #      - rabbitmqctl stop_app
-    #      - "rabbitmqctl join_cluster rabbit_openstack01@{{ hostname_node0 }}"
-    #      - rabbitmqctl start_app
+- name: setup the cluster
+  command: "docker exec -i rabbitmq.service {{ item }}"
+  with_items:
+      - rabbitmqctl stop_app
+      - "rabbitmqctl join_cluster rabbit_{{ hostname_node0 }}@{{ hostname_node0 }}"
+      - rabbitmqctl start_app
+  when: ansible_nodename != hostname_node0