diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml
index f12ffa6878..6de6efb608 100644
--- a/roles/rabbitmq_cluster/tasks/main.yml
+++ b/roles/rabbitmq_cluster/tasks/main.yml
@@ -255,15 +255,18 @@
   - rabbitmq_cluster
   - config
 
-- name: Create the zmq.topic exchange in /public_pubsub
+- name: Create the zmq.topic exchange in the {{ item }} vhost
   run_once: true
   delegate_to: "rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org"
   rabbitmq_exchange:
     name: "zmq.topic"
     exchange_type: "topic"
-    vhost: "/public_pubsub"
+    vhost: "{{ item }}"
     login_user: admin
     login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
+  with_items:
+  - /pubsub
+  - /public_pubsub
   tags:
   - rabbitmq_cluster
   - config