diff --git a/roles/odcs/base/templates/etc/odcs/config.py.j2 b/roles/odcs/base/templates/etc/odcs/config.py.j2
index 65f22aef1f..d610aeadf7 100644
--- a/roles/odcs/base/templates/etc/odcs/config.py.j2
+++ b/roles/odcs/base/templates/etc/odcs/config.py.j2
@@ -120,11 +120,11 @@ class ProdConfiguration(BaseConfiguration):
     MESSAGING_KEY_FILE = "/etc/ssl/odcs/umb-client.key"
     MESSAGING_CA_CERT = "{{ odcs_messaging_ca_cert }}"
 {% if env == "staging" %}
-    MESSAGING_TOPIC_PREFIX = "org.fedoraproject.stg"
+    MESSAGING_TOPIC_PREFIX = "org.fedoraproject.stg."
 {% else %}
-    MESSAGING_TOPIC_PREFIX = "org.fedoraproject.prod"
+    MESSAGING_TOPIC_PREFIX = "org.fedoraproject.prod."
 {% endif %}
-    MESSAGING_TOPIC = "odcs.state.change"
+    MESSAGING_TOPIC = "odcs.compose.state-changed"
     INTERNAL_MESSAGING_TOPIC = "odcs.internal.msg"
 
     PUNGI_RUNROOT_ENABLED = {{ odcs_pungi_runroot_enabled }}