diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2
index 436d14e534..8d4b7ab62d 100644
--- a/roles/robosignatory/templates/robosignatory.toml.j2
+++ b/roles/robosignatory/templates/robosignatory.toml.j2
@@ -11,7 +11,7 @@ callback = "robosignatory.consumer:Consumer"
 # Note the double brackets below.
 # To add another binding, add another [[bindings]] section.
 [[bindings]]
-queue = "robosignatory"
+queue = "robosignatory{{ env_suffix }}"
 exchange = "amq.topic"
 routing_keys = [
     "org.fedoraproject.*.pungi.compose.ostree",
@@ -28,7 +28,7 @@ certfile = "/etc/pki/fedora-messaging/robosignatory-cert.pem"
 [client_properties]
 app = "RoboSignatory"
 
-[queues.robosignatory]
+[queues."robosignatory{{ env_suffix }}"]
 durable = true
 auto_delete = false
 exclusive = false