diff --git a/inventory/group_vars/bodhi-backend-stg b/inventory/group_vars/bodhi-backend-stg
index ea98d10567..dd3ce95f8b 100644
--- a/inventory/group_vars/bodhi-backend-stg
+++ b/inventory/group_vars/bodhi-backend-stg
@@ -20,7 +20,7 @@ nrpe_procs_crit: 1000
 
 host_group: bodhi2
 
-bodhi_message_queue_name: "bodhi_composer"
+bodhi_message_queue_name: "bodhi{{ env_suffix }}_composer"
 # Define the topics that our fedora-messaging queue should be subscribed to.
 bodhi_message_routing_keys:
   - "org.fedoraproject.*.bodhi.composer.start"
diff --git a/inventory/group_vars/bodhi2-stg b/inventory/group_vars/bodhi2-stg
index 712126feb4..45631843cd 100644
--- a/inventory/group_vars/bodhi2-stg
+++ b/inventory/group_vars/bodhi2-stg
@@ -22,7 +22,7 @@ openshift_pods: 1
 
 tcp_ports: [ 80 ]
 
-bodhi_message_queue_name: "bodhi"
+bodhi_message_queue_name: "bodhi{{ env_suffix }}"
 # Define the topics that our fedora-messaging queue should be subscribed to.
 bodhi_message_routing_keys:
   - "org.fedoraproject.*.bodhi.update.edit"