diff --git a/roles/openshift-apps/fmn/templates/consumer.toml b/roles/openshift-apps/fmn/templates/consumer.toml
index 034f7a067d..8a062523db 100644
--- a/roles/openshift-apps/fmn/templates/consumer.toml
+++ b/roles/openshift-apps/fmn/templates/consumer.toml
@@ -18,14 +18,14 @@ durable = true
 auto_delete = false
 arguments = {}
 
-[queues.fmn]
+[queues."fmn{{ env_suffix }}"]
 durable = true
 auto_delete = false
 exclusive = false
 arguments = {}
 
 [[bindings]]
-queue = "fmn"
+queue = "fmn{{ env_suffix }}"
 exchange = "amq.topic"
 routing_keys = ["#"]