diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml
index 59d15e273f..c1ac6789ad 100644
--- a/playbooks/openshift-apps/messaging-bridges.yml
+++ b/playbooks/openshift-apps/messaging-bridges.yml
@@ -13,10 +13,10 @@
   tasks:
   - name: Create the RabbitMQ user
     rabbitmq_user:
-      user: messaging-bridges
+      user: "messaging-bridge{{ env_suffix }}.fedoraproject.org"
       vhost: /pubsub
-      read_priv: .*
-      write_priv: .*
+      read_priv: "(amqp_to_zmq|amqp_bridge_verify_missing)"
+      write_priv: "amq\.topic"
     tags:
     - config
   - name: Create the RabbitMQ exchanges
diff --git a/roles/openshift-apps/messaging-bridges/templates/configmap.yml b/roles/openshift-apps/messaging-bridges/templates/configmap.yml
index e336312996..c3eb9feca7 100644
--- a/roles/openshift-apps/messaging-bridges/templates/configmap.yml
+++ b/roles/openshift-apps/messaging-bridges/templates/configmap.yml
@@ -7,7 +7,7 @@ metadata:
     app: messaging-bridges
 data:
   config.toml: |-
-    amqp_url = "amqps://messaging-bridges:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/pubsub"
+    amqp_url = "amqps://messaging-bridge{{ env_suffix }}.fedoraproject.org:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/pubsub"
     publish_exchange = "amq.topic"
     
     [tls]
@@ -43,7 +43,7 @@ data:
     level = "WARNING"
     handlers = ["console"]
   amqp-to-zmq.toml: |-
-    amqp_url = "amqps://messaging-bridges:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/pubsub"
+    amqp_url = "amqps://messaging-bridge{{ env_suffix }}.fedoraproject.org:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/pubsub"
     publish_exchange = "amq.topic"
     
     [[bindings]]