diff --git a/playbooks/openshift-apps/resultsdb-ci-listener.yml b/playbooks/openshift-apps/resultsdb-ci-listener.yml
index 8dc648f72b..7c33fac9d7 100644
--- a/playbooks/openshift-apps/resultsdb-ci-listener.yml
+++ b/playbooks/openshift-apps/resultsdb-ci-listener.yml
@@ -41,13 +41,13 @@
       app: resultsdb-ci-listener
       secret_name: resultsdb-ci-listener-fedora-messaging-key
       key: resultsdb-ci-listener.key
-      privatefile: "rabbitmq/{{env}}/pki/private/resultsdb-ci-listener{{env_suffix}}.key"
+      privatefile: "rabbitmq/{{env}}/pki/private/resultsdb{{env_suffix}}-ci-listener.key"
 
     - role: openshift/secret-file
       app: resultsdb-ci-listener
       secret_name: resultsdb-ci-listener-fedora-messaging-crt
       key: resultsdb-ci-listener.crt
-      privatefile: "rabbitmq/{{env}}/pki/issued/resultsdb-ci-listener{{env_suffix}}.crt"
+      privatefile: "rabbitmq/{{env}}/pki/issued/resultsdb{{env_suffix}}-ci-listener.crt"
 
     - role: openshift/secret-file
       app: resultsdb-ci-listener
diff --git a/roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml b/roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml
index 942f2526b8..b986308196 100644
--- a/roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml
+++ b/roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml
@@ -60,9 +60,9 @@ data:
     ]
 
     [tls]
-    ca_cert = "/etc/pki/rabbitmq/ca/resultsdb-ci-listener.ca"
-    keyfile = "/etc/pki/rabbitmq/key/resultsdb-ci-listener.key"
-    certfile = "/etc/pki/rabbitmq/crt/resultsdb-ci-listener.crt"
+    ca_cert = "/etc/pki/rabbitmq/ca/resultsdb{{ env_suffix }}-ci-listener.ca"
+    keyfile = "/etc/pki/rabbitmq/key/resultsdb{{ env_suffix }}-ci-listener.key"
+    certfile = "/etc/pki/rabbitmq/crt/resultsdb{{ env_suffix }}-ci-listener.crt"
 
     [client_properties]
     app = "resultsdb_listener"