diff --git a/playbooks/openshift-apps/planet.yml b/playbooks/openshift-apps/planet.yml
index c183103982..f7fe1a77c1 100644
--- a/playbooks/openshift-apps/planet.yml
+++ b/playbooks/openshift-apps/planet.yml
@@ -99,3 +99,7 @@
     secret_name: planet-fedora-messaging-key
     key: planet-key.pem
     privatefile: "rabbitmq/{{env}}/pki/private/planet{{env_suffix}}.key"
+
+  - role: rabbit/user
+    username: "planet{{ env_suffix }}"
+    sent_topics: ^org\.fedoraproject\.{{ env_short }}\.planet\..*
diff --git a/roles/openshift-apps/planet/templates/config.toml b/roles/openshift-apps/planet/templates/config.toml
index 863eecb5f8..476564019d 100644
--- a/roles/openshift-apps/planet/templates/config.toml
+++ b/roles/openshift-apps/planet/templates/config.toml
@@ -58,9 +58,9 @@ app_contacts_email = [
 exchange = "amq.topic"
 routing_keys = [
 {% if  env == "staging" %}
-    'stg.fedoraplanet.org.build'
+    'org.fedoraproject.stg.planet.build'
 {% else %}
-    'fedoraplanet.org.build'
+    'org.fedoraproject.prod.planet.build'
 {%- endif %}
     ]