diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml
index 593b8728a3..8efb23d068 100644
--- a/roles/rabbitmq_cluster/tasks/main.yml
+++ b/roles/rabbitmq_cluster/tasks/main.yml
@@ -264,11 +264,23 @@
   rabbitmq_exchange:
     name: "zmq.topic"
     exchange_type: "topic"
-    vhost: "{{ item }}"
+    vhost: "/pubsub"
+    login_user: admin
+    login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
+  tags:
+  - rabbitmq_cluster
+  - config
+
+- name: Create the zmq.topic exchange in the {{ item }} vhost
+  run_once: true
+  delegate_to: "rabbitmq01{{ env_suffix }}.{{ item }}.fedoraproject.org"
+  with_items: "{{ datacenter }}"
+  rabbitmq_exchange:
+    name: "zmq.topic"
+    exchange_type: "topic"
+    vhost: "/public_pubsub"
     login_user: admin
     login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
-  with_items:
-  - /pubsub
   - /public_pubsub
   tags:
   - rabbitmq_cluster