diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 453c05f776..208b8c7974 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -571,7 +571,6 @@ osprofiler_backend_connection_string: "{{ redis_connection_string if osprofiler_
 rabbitmq_hipe_compile: "no"
 rabbitmq_user: "openstack"
 rabbitmq_monitoring_user: ""
-rabbitmq_version: "rabbitmq_server-3.6/plugins/rabbitmq_clusterer-3.6.x.ez/rabbitmq_clusterer-3.6.x-667f92b0/ebin"
 outward_rabbitmq_user: "openstack"
 
 ####################
diff --git a/ansible/roles/rabbitmq/tasks/config.yml b/ansible/roles/rabbitmq/tasks/config.yml
index 91ee75bc39..5c96364ddb 100644
--- a/ansible/roles/rabbitmq/tasks/config.yml
+++ b/ansible/roles/rabbitmq/tasks/config.yml
@@ -41,7 +41,6 @@
   with_items:
     - "rabbitmq-env.conf"
     - "rabbitmq.config"
-    - "rabbitmq-clusterer.config"
     - "definitions.json"
   notify:
     - Restart rabbitmq container
diff --git a/ansible/roles/rabbitmq/tasks/upgrade.yml b/ansible/roles/rabbitmq/tasks/upgrade.yml
index 5452fc4939..f7f74c97c5 100644
--- a/ansible/roles/rabbitmq/tasks/upgrade.yml
+++ b/ansible/roles/rabbitmq/tasks/upgrade.yml
@@ -15,23 +15,6 @@
 
 - include_tasks: config.yml
 
-- name: Find gospel node
-  command: docker exec -t {{ project_name }} /usr/local/bin/rabbitmq_get_gospel_node
-  changed_when: gospel_node.stdout | from_json | changed
-  failed_when: gospel_node.stdout | from_json | failed
-  register: gospel_node
-  run_once: True
-
-- name: Stopping non-gospel nodes
-  become: true
-  kolla_docker:
-    action: "stop_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ project_name }}"
-  when:
-    - rabbitmq_hostname != (gospel_node.stdout | from_json).hostname
-    - rabbitmq_differs['result']
-
 - name: Flush handlers
   meta: flush_handlers
   when:
diff --git a/ansible/roles/rabbitmq/templates/definitions.json.j2 b/ansible/roles/rabbitmq/templates/definitions.json.j2
index e06ae867c3..be3c47ee02 100644
--- a/ansible/roles/rabbitmq/templates/definitions.json.j2
+++ b/ansible/roles/rabbitmq/templates/definitions.json.j2
@@ -5,7 +5,7 @@
     {% endif %}
   ],
   "users": [
-    {"name": "{{ role_rabbitmq_user }}", "password": "{{ role_rabbitmq_password }}", "tags": "administrator"}{% if role_rabbitmq_monitoring_user is defined and role_rabbitmq_monitoring_user %},
+    {"name": "{{ role_rabbitmq_user }}", "password": "password", "tags": "administrator"}{% if role_rabbitmq_monitoring_user is defined and role_rabbitmq_monitoring_user %},
     {"name": "{{ role_rabbitmq_monitoring_user }}", "password": "{{ role_rabbitmq_monitoring_password }}", "tags": "monitoring"}{% endif %}{% if project_name == 'outward_rabbitmq' %},
     {"name": "{{ murano_agent_rabbitmq_user }}", "password": "{{ murano_agent_rabbitmq_password }}", "tags": "management"}
     {% endif %}
diff --git a/ansible/roles/rabbitmq/templates/rabbitmq-clusterer.config.j2 b/ansible/roles/rabbitmq/templates/rabbitmq-clusterer.config.j2
deleted file mode 100644
index 35f0e67fcb..0000000000
--- a/ansible/roles/rabbitmq/templates/rabbitmq-clusterer.config.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-  {version, 1},
-  {nodes, [
-  {% for host in groups[role_rabbitmq_groups] %}
-    {'rabbit@{{ hostvars[host]['ansible_hostname'] }}', disc}
-      {%- if not loop.last -%},{%- endif %}
-  {% endfor %}
-  ]},
-  {gospel,
-    {node, 'rabbit@{{ hostvars[groups[role_rabbitmq_groups][0]]['ansible_hostname'] }}'}}
-].
diff --git a/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
index d0a9fe0dc5..e2eea5e87c 100644
--- a/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
+++ b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
@@ -1,7 +1,4 @@
 RABBITMQ_NODENAME=rabbit@{{ ansible_hostname }}
-RABBITMQ_BOOT_MODULE=rabbit_clusterer
-RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-pa /usr/lib/rabbitmq/lib/{{ rabbitmq_version }}"
-
 RABBITMQ_LOG_BASE=/var/log/kolla/{{ project_name }}
 
 # TODO(sdake, vhosakot)
diff --git a/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 b/ansible/roles/rabbitmq/templates/rabbitmq.config.j2
index 47b3905955..960f9fb8a7 100644
--- a/ansible/roles/rabbitmq/templates/rabbitmq.config.j2
+++ b/ansible/roles/rabbitmq/templates/rabbitmq.config.j2
@@ -19,7 +19,6 @@
       {port, {{ role_rabbitmq_management_port }}}
     ]},
     {load_definitions, "/etc/rabbitmq/definitions.json"}
-  ]},
-  {rabbitmq_clusterer, [{config, "/etc/rabbitmq/rabbitmq-clusterer.config"}]}
+  ]}
 ].
 % EOF
diff --git a/ansible/roles/rabbitmq/templates/rabbitmq.json.j2 b/ansible/roles/rabbitmq/templates/rabbitmq.json.j2
index 07987def37..c2b9269f6c 100644
--- a/ansible/roles/rabbitmq/templates/rabbitmq.json.j2
+++ b/ansible/roles/rabbitmq/templates/rabbitmq.json.j2
@@ -13,12 +13,6 @@
             "owner": "rabbitmq",
             "perm": "0600"
         },
-        {
-            "source": "{{ container_config_directory }}/rabbitmq-clusterer.config",
-            "dest": "/etc/rabbitmq/rabbitmq-clusterer.config",
-            "owner": "rabbitmq",
-            "perm": "0600"
-        },
         {
             "source": "{{ container_config_directory }}/definitions.json",
             "dest": "/etc/rabbitmq/definitions.json",
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 95a7f27c83..2ea3107849 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -45,3 +45,6 @@ ceph_pool_pgp_num: 8
 {% endif %}
 
 keystone_token_provider: "fernet"
+
+# TODO(pbourke): remove once https://review.openstack.org/#/c/584427/ is merged
+rpc_transport_url: "rabbit://openstack:password@{{ api_interface_address }}:5672"
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index bdb0ec6e4f..18903d25c4 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -149,7 +149,8 @@ function test_openstack {
     tools/kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks > /tmp/logs/ansible/prechecks1
     # TODO(jeffrey4l): add pull action when we have a local registry
     # service in CI
-    tools/kolla-ansible -i ${RAW_INVENTORY} -vvv deploy > /tmp/logs/ansible/deploy
+    # TODO(pbourke): remove '-e rabbitmq_password=password' once https://review.openstack.org/#/c/584427/ is merged
+    tools/kolla-ansible -i ${RAW_INVENTORY} -vvv deploy -e rabbitmq_password=password > /tmp/logs/ansible/deploy
     tools/kolla-ansible -i ${RAW_INVENTORY} -vvv post-deploy > /tmp/logs/ansible/post-deploy
     tools/kolla-ansible -i ${RAW_INVENTORY} -vvv check > /tmp/logs/ansible/check-deploy