diff --git a/playbooks/openshift-apps/cloud-image-uploader.yml b/playbooks/openshift-apps/cloud-image-uploader.yml
index b1f32d2537..6b32ae66f6 100644
--- a/playbooks/openshift-apps/cloud-image-uploader.yml
+++ b/playbooks/openshift-apps/cloud-image-uploader.yml
@@ -10,8 +10,8 @@
 
   roles:
   - role: rabbit/queue
-    username: "cloud-image-uploader"
-    queue_name: "cloud-image-uploader"
+    username: "cloud-image-uploader{{ env_suffix }}"
+    queue_name: "cloud-image-uploader{{ env_suffix }}"
     routing_keys:
       - "org.fedoraproject.{{ env }}.buildsys.build.state.change"
     thresholds:
diff --git a/roles/openshift-apps/cloud-image-uploader/templates/config.toml b/roles/openshift-apps/cloud-image-uploader/templates/config.toml
index 4813342fe8..30e99cf67b 100644
--- a/roles/openshift-apps/cloud-image-uploader/templates/config.toml
+++ b/roles/openshift-apps/cloud-image-uploader/templates/config.toml
@@ -2,7 +2,7 @@
 # For complete details on all configuration options, see the documentation
 # https://fedora-messaging.readthedocs.io/en/latest/configuration.html.
 
-amqp_url = "amqps://cloud-image-uploader:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
+amqp_url = "amqps://cloud-image-uploader{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
 callback = "fedora_cloud_image_uploader:Uploader"
 passive_declares = true
 
@@ -17,7 +17,7 @@ app_url = "https://pagure.io/cloud-image-uploader"
 app_contacts_email = "cloud@lists.fedoraproject.org"
 
 [[bindings]]
-queue = "cloud-image-uploader"
+queue = "cloud-image-uploader{{ env_suffix }}"
 exchange = "amq.topic"
 routing_keys = ["org.fedoraproject.{{ env }}.buildsys.build.state.change"]