diff --git a/roles/openshift-apps/waiverdb/templates/config.toml b/roles/openshift-apps/waiverdb/templates/config.toml
index ee15e27909..1d46d1bf9b 100644
--- a/roles/openshift-apps/waiverdb/templates/config.toml
+++ b/roles/openshift-apps/waiverdb/templates/config.toml
@@ -10,6 +10,6 @@ topic_prefix = "org.fedoraproject.prod"
 {% endif %}
 
 [tls]
-ca_cert = "/etc/pki/rabbitmq/ca/waiverdb.ca"
-keyfile = "/etc/pki/rabbitmq/key/waiverdb.key"
-certfile = "/etc/pki/rabbitmq/crt/waiverdb.crt"
+ca_cert = "/etc/pki/rabbitmq/ca/waiverdb{{env_suffix}}.ca"
+keyfile = "/etc/pki/rabbitmq/key/waiverdb{{env_suffix}}.key"
+certfile = "/etc/pki/rabbitmq/crt/waiverdb{{env_suffix}}.crt"