diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml
index ecc4b6e9a8..b1339c8537 100644
--- a/playbooks/groups/openqa.yml
+++ b/playbooks/groups/openqa.yml
@@ -69,7 +69,7 @@
   roles:
   # fedora-messaging queue/user setup
   - role: rabbit/user
-    username: "openqa{{ env_suffix }}"
+    username: "openqa{{ openqa_env_suffix }}"
     tags: ['rabbit']
     when: deployment_type == "stg"
     # we also need prod user for stg...
@@ -79,7 +79,7 @@
     when: deployment_type == "stg"
   - role: rabbit/queue
     username: "openqa"
-    queue_name: "openqa{{ env_suffix }}_scheduler"
+    queue_name: "openqa{{ openqa_env_suffix }}_scheduler"
     routing_keys:
         - "org.fedoraproject.prod.pungi.compose.status.change"
         - "org.fedoraproject.prod.bodhi.update.request.testing"
@@ -87,15 +87,15 @@
     tags: ['rabbit']
     when: deployment_type == "stg"
   - role: rabbit/queue
-    username: "openqa{{ env_suffix }}"
-    queue_name: "openqa{{ env_suffix }}_resultsdb_reporter"
+    username: "openqa{{ openqa_env_suffix }}"
+    queue_name: "openqa{{ openqa_env_suffix }}_resultsdb_reporter"
     routing_keys:
         - "org.fedoraproject.{{ deployment_type }}.openqa.job.done"
     tags: ['rabbit']
     when: deployment_type == "stg"
   - role: rabbit/queue
-    username: "openqa{{ env_suffix }}"
-    queue_name: "openqa{{ env_suffix }}_wiki_reporter"
+    username: "openqa{{ openqa_env_suffix }}"
+    queue_name: "openqa{{ openqa_env_suffix }}_wiki_reporter"
     routing_keys:
         - "org.fedoraproject.{{ deployment_type }}.openqa.job.done"
     tags: ['rabbit']