diff --git a/inventory/group_vars/checkcompose_common b/inventory/group_vars/checkcompose_common
index 65a6a980b4..ae53f05424 100644
--- a/inventory/group_vars/checkcompose_common
+++ b/inventory/group_vars/checkcompose_common
@@ -2,13 +2,11 @@
 # to create queues on the infra AMQP broker, by broker config
 checkcompose_amqp_passive: true
 
-# fedora-messaging job scheduler settings: most of these are the same
-# for prod and stg as they both must listen for prod messages. Only
-# the queue names differs
-checkcompose_amqp_url: "amqps://openqa:@rabbitmq.fedoraproject.org/%2Fpubsub"
-checkcompose_amqp_cacert: /etc/fedora-messaging/cacert.pem
-checkcompose_amqp_key: /etc/pki/fedora-messaging/openqa-key.pem
-checkcompose_amqp_cert: /etc/pki/fedora-messaging/openqa-cert.pem
+# fedora-messaging compose report sender settings
+checkcompose_amqp_url: "amqps://openqa{{ checkcompose_env_suffix }}:@rabbitmq{{ checkcompose_env_suffix }}.fedoraproject.org/%2Fpubsub"
+checkcompose_amqp_cacert: /etc/fedora-messaging/cacert{{ checkcompose_env_suffix }}.pem
+checkcompose_amqp_key: /etc/pki/fedora-messaging/openqa{{ checkcompose_env_suffix }}-key.pem
+checkcompose_amqp_cert: /etc/pki/fedora-messaging/openqa{{ checkcompose_env_suffix }}-cert.pem
 checkcompose_amqp_queue: "openqa{{ checkcompose_env_suffix }}_checkcomp"
 checkcompose_amqp_routing_keys: ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"]
 
diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml
index b8a8732a1f..013605bd24 100644
--- a/playbooks/groups/openqa.yml
+++ b/playbooks/groups/openqa.yml
@@ -94,7 +94,7 @@
     # check-compose queue, we still use openqa auth for this as it's
     # easy that way
   - role: rabbit/queue
-    username: "openqa{{ openqa_env_suffix }}"
+    username: "openqa{{ checkcompose_env_suffix }}"
     queue_name: "openqa{{ checkcompose_env_suffix }}_checkcomp"
     routing_keys:
         - "org.fedoraproject.{{ deployment_type }}.openqa.job.done"