diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml
index 171778c12c..6c86ce7f3e 100644
--- a/playbooks/groups/bodhi-backend.yml
+++ b/playbooks/groups/bodhi-backend.yml
@@ -113,7 +113,7 @@
 
   - role: rabbit/queue
     username: "bodhi{{ env_suffix }}"
-    queue_name: "koji_sync_listener{{ env_suffix }}"
+    queue_name: "bodhi_koji_sync_listener{{ env_suffix }}"
     routing_keys:
       - "io.pagure.*.pagure.issue.edit"
     thresholds:
diff --git a/roles/bodhi2/backend/templates/koji_sync_listener.toml b/roles/bodhi2/backend/templates/koji_sync_listener.toml
index 139ae2109b..93835da9e3 100644
--- a/roles/bodhi2/backend/templates/koji_sync_listener.toml
+++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml
@@ -9,7 +9,7 @@ callback = "koji_sync_listener:KojiSyncListener"
 # topic_prefix = ""
 
 [[bindings]]
-queue = "koji_sync_listener{{ env_suffix }}"
+queue = "bodhi_koji_sync_listener{{ env_suffix }}"
 
 exchange = "amq.topic"
 routing_keys = [
@@ -25,7 +25,7 @@ certfile = "/etc/pki/fedora-messaging/bodhi-cert.pem"
 app = "koji_sync_listener"
 app_contacts_email = ["pingou@fedoraproject.org"]
 
-[queues."koji_sync_listener{{ env_suffix }}"]
+[queues."bodhi_koji_sync_listener{{ env_suffix }}"]
 durable = true
 auto_delete = false
 exclusive = false