diff --git a/roles/pagure/frontend/templates/fedora-messaging.toml b/roles/pagure/frontend/templates/fedora-messaging.toml
index 7faa1e7592..dc678fdf8f 100644
--- a/roles/pagure/frontend/templates/fedora-messaging.toml
+++ b/roles/pagure/frontend/templates/fedora-messaging.toml
@@ -1,11 +1,15 @@
 # A sample configuration for fedora-messaging. This file is in the TOML format.
 # For complete details on all configuration options, see the documentation.
 
-amqp_url = "amqps://pagure{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
+{% if env == "pagure-staging" %}
+amqp_url = "amqps://pagure.stg:@rabbitmq.stg.fedoraproject.org/%2Fpubsub"
+{% else %}
+amqp_url = "amqps://pagure:@rabbitmq.fedoraproject.org/%2Fpubsub"
+{% endif %}
 
 # The topic_prefix configuration value will add a prefix to the topics of every sent message.
 # This is used for migrating from fedmsg, and should not be used afterwards.
-{% if env == "staging" %}
+{% if env == "pagure-staging" %}
 topic_prefix = "org.fedoraproject.stg"
 {% else %}
 topic_prefix = "org.fedoraproject.prod"