diff --git a/roles/openshift-apps/badges/templates/fm-fedbadges.toml b/roles/openshift-apps/badges/templates/fm-fedbadges.toml
index 81acd792c2..24cdb398ea 100644
--- a/roles/openshift-apps/badges/templates/fm-fedbadges.toml
+++ b/roles/openshift-apps/badges/templates/fm-fedbadges.toml
@@ -9,9 +9,9 @@ passive_declares = true
 # 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" %}
-topic_prefix = "org.fedoraproject.stg.badges"
+topic_prefix = "org.fedoraproject.stg"
 {% else %}
-topic_prefix = "org.fedoraproject.prod.badges"
+topic_prefix = "org.fedoraproject.prod"
 {% endif %}
 
 [tls]
diff --git a/roles/openshift-apps/badges/templates/fm-tahrir.toml b/roles/openshift-apps/badges/templates/fm-tahrir.toml
index 58c487deac..af468c2a38 100644
--- a/roles/openshift-apps/badges/templates/fm-tahrir.toml
+++ b/roles/openshift-apps/badges/templates/fm-tahrir.toml
@@ -8,9 +8,9 @@ passive_declares = true
 # 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" %}
-topic_prefix = "org.fedoraproject.stg.badges"
+topic_prefix = "org.fedoraproject.stg"
 {% else %}
-topic_prefix = "org.fedoraproject.prod.badges"
+topic_prefix = "org.fedoraproject.prod"
 {% endif %}
 
 [tls]