diff --git a/playbooks/openshift-apps/resultsdb-ci-listener.yml b/playbooks/openshift-apps/resultsdb-ci-listener.yml
index 7c33fac9d7..b1d937989d 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{{env_suffix}}-ci-listener.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{{env_suffix}}-ci-listener.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 4f474fb666..942f2526b8 100644
--- a/roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml
+++ b/roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml
@@ -10,7 +10,7 @@ data:
     # For complete details on all configuration options, see the documentation
     # https://fedora-messaging.readthedocs.io/en/latest/configuration.html.
 
-    amqp_url = "amqps://resultsdb{{ env_suffix }}-ci-listener:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
+    amqp_url = "amqps://resultsdb{{ env_suffix }}_ci_listener:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
 
 {% if env == "staging" %}
     topic_prefix = "org.fedoraproject.stg"