diff --git a/roles/openshift-apps/greenwave/templates/config.toml b/roles/openshift-apps/greenwave/templates/config.toml
index a2f8ec931c..81b40ef721 100644
--- a/roles/openshift-apps/greenwave/templates/config.toml
+++ b/roles/openshift-apps/greenwave/templates/config.toml
@@ -14,10 +14,8 @@ callback = "greenwave.consumers.fedora_messaging_consumer:fedora_messaging_callb
 queue = "greenwave"
 exchange = "amq.topic"
 routing_keys = [
-    "org.fedoraproject.prod.taskotron.result.new",
-    "org.fedoraproject.stg.taskotron.result.new",
-    "org.fedoraproject.prod.waiver.new",
-    "org.fedoraproject.stg.waiver.new",
+    "org.fedoraproject.*.taskotron.result.new",
+    "org.fedoraproject.*.waiver.new",
 ]
 
 [tls]