diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml
index f50861927a..0318ad37f8 100644
--- a/playbooks/openshift-apps/greenwave.yml
+++ b/playbooks/openshift-apps/greenwave.yml
@@ -10,10 +10,9 @@
 
 
   roles:
-
   - role: rabbit/queue
     username: greenwave{{ env_suffix }}
-    queue_name: greenwave
+    queue_name: greenwave{{ env_suffix }}
     routing_keys:
       - "org.fedoraproject.*.taskotron.result.new"
       - "org.fedoraproject.*.waiver.new"
diff --git a/roles/openshift-apps/greenwave/templates/config.toml b/roles/openshift-apps/greenwave/templates/config.toml
index 8a9c133002..d36a5d7853 100644
--- a/roles/openshift-apps/greenwave/templates/config.toml
+++ b/roles/openshift-apps/greenwave/templates/config.toml
@@ -11,7 +11,7 @@ callback = "greenwave.consumers.fedora_messaging_consumer:fedora_messaging_callb
 # Note the double brackets below.
 # To add another binding, add another [[bindings]] section.
 [[bindings]]
-queue = "greenwave"
+queue = "greenwave{{ env_suffix }}"
 exchange = "amq.topic"
 routing_keys = [
     "org.fedoraproject.*.taskotron.result.new",
@@ -26,7 +26,7 @@ certfile = "/etc/pki/rabbitmq/crt/greenwave.crt"
 [client_properties]
 app = "greenwave"
 
-[queues.greenwave]
+[queues."greenwave{{ env_suffix }}"]
 durable = true
 auto_delete = false
 exclusive = false