diff --git a/playbooks/openshift-apps/kerneltest.yml b/playbooks/openshift-apps/kerneltest.yml
index 43946b9f82..5cc5e6241d 100644
--- a/playbooks/openshift-apps/kerneltest.yml
+++ b/playbooks/openshift-apps/kerneltest.yml
@@ -33,7 +33,12 @@
   pre_tasks:
   - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README
 
+
   roles:
+  - role: rabbit/user
+    username: "kerneltest{{ env_suffix }}"
+    sent_topics: ^org\.fedoraproject\.{{ env_short }}\.kerneltest\..*
+
   - role: openshift/project
     app: kerneltest
     description: kerneltest
diff --git a/roles/openshift-apps/kerneltest/templates/fedora-messaging.toml b/roles/openshift-apps/kerneltest/templates/fedora-messaging.toml
index bcecd25438..2779b6a1aa 100644
--- a/roles/openshift-apps/kerneltest/templates/fedora-messaging.toml
+++ b/roles/openshift-apps/kerneltest/templates/fedora-messaging.toml
@@ -1,4 +1,4 @@
-amqp_url = "amqps://kerneltest:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
+amqp_url = "amqps://kerneltest{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
 
 # Just check if the queue exist, don't try to create it (the server does not allow it).
 passive_declares = true