diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml
index 1d3bfe787c..64287a7b65 100644
--- a/roles/rabbitmq_cluster/tasks/main.yml
+++ b/roles/rabbitmq_cluster/tasks/main.yml
@@ -128,6 +128,17 @@
   - rabbitmq_cluster
   - config
 
+# This is the publicly accessible virtual host
+- name: Configure the publicly accessible vhost
+  run_once: true
+  delegate_to: "rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org"
+  rabbitmq_vhost:
+    name: /public_pubsub
+    state: present
+  tags:
+  - rabbitmq_cluster
+  - config
+
 - name: Configure the HA policy for queues on the pubsub virtual
   rabbitmq_policy:
     name: HA
@@ -191,17 +202,6 @@
   - rabbitmq_cluster
   - config
 
-# This is the publicly accessible virtual host
-- name: Configure the publicly accessible vhost
-  run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org"
-  rabbitmq_vhost:
-    name: /public_pubsub
-    state: present
-  tags:
-  - rabbitmq_cluster
-  - config
-
 - name: Create the zmq.topic exchange in /public_pubsub
   run_once: true
   delegate_to: "rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org"