diff --git a/roles/ipa/server/templates/fedora-messaging.conf.j2 b/roles/ipa/server/templates/fedora-messaging.conf.j2
index 0f57582d7e..896e7d0bcd 100644
--- a/roles/ipa/server/templates/fedora-messaging.conf.j2
+++ b/roles/ipa/server/templates/fedora-messaging.conf.j2
@@ -5,11 +5,7 @@ amqp_url = "amqps://ipa{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.
 passive_declares = true
 
 # The topic_prefix configuration value will add a prefix to the topics of every sent message.
-{% if env == "staging" %}
-topic_prefix = "org.fedoraproject.stg"
-{% else %}
-topic_prefix = "org.fedoraproject.prod"
-{% endif %}
+topic_prefix = "org.fedoraproject.{{ env_short }}"
 
 
 # Authentication is TLS-based