diff --git a/inventory/group_vars/checkcompose_common b/inventory/group_vars/checkcompose_common
index bb999faf14..65a6a980b4 100644
--- a/inventory/group_vars/checkcompose_common
+++ b/inventory/group_vars/checkcompose_common
@@ -9,7 +9,7 @@ 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
-checkcompose_amqp_queue: "openqa_checkcomp{{ checkcompose_env_suffix }}"
+checkcompose_amqp_queue: "openqa{{ checkcompose_env_suffix }}_checkcomp"
 checkcompose_amqp_routing_keys: ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"]
 
 # fedora-messaging email error reporting settings
diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml
index 69c3a759ab..b8a8732a1f 100644
--- a/playbooks/groups/openqa.yml
+++ b/playbooks/groups/openqa.yml
@@ -95,7 +95,7 @@
     # easy that way
   - role: rabbit/queue
     username: "openqa{{ openqa_env_suffix }}"
-    queue_name: "openqa_checkcomp{{ checkcompose_env_suffix }}"
+    queue_name: "openqa{{ checkcompose_env_suffix }}_checkcomp"
     routing_keys:
         - "org.fedoraproject.{{ deployment_type }}.openqa.job.done"
     vars: