diff --git a/roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml b/roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml
index 86a2f4a38b..7cf79bc4d6 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.ca"
-    keyfile = "/etc/pki/rabbitmq/key/resultsdb.key"
-    certfile = "/etc/pki/rabbitmq/crt/resultsdb.crt"
+    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"
 
     [client_properties]
     app = "resultsdb_listener"
@@ -123,8 +123,4 @@ data:
 
     [sender]
     sender_type = ResultsdbSender
-{% if env == "staging" %}
-    resultsdb_url = https://resultsdb.stg.fedoraproject.org
-{% else %}
-    resultsdb_url = https://resultsdb.fedoraproject.org
-{% endif %}
\ No newline at end of file
+    resultsdb_url = http://resultsdb-api.resultsdb.svc.cluster.local:5001/api/v2.0
diff --git a/roles/openshift-apps/resultsdb-ci-listener/templates/deploymentconfigs.yml b/roles/openshift-apps/resultsdb-ci-listener/templates/deploymentconfigs.yml
index f0d4dbf27c..a85b8b0c24 100644
--- a/roles/openshift-apps/resultsdb-ci-listener/templates/deploymentconfigs.yml
+++ b/roles/openshift-apps/resultsdb-ci-listener/templates/deploymentconfigs.yml
@@ -25,7 +25,6 @@ spec:
             - name: config-volume
               mountPath: /etc/ci-resultsdb-listener
               readOnly: true
-{% if deployment_type is defined and deployment_type not in ['local', 'dev'] %}
             - name: fedora-messaging-ca-volume
               mountPath: /etc/pki/rabbitmq/ca
               readOnly: true
@@ -38,12 +37,10 @@ spec:
             - name: fedora-messaging-config-volume
               mountPath: /etc/fedora-messaging
               readOnly: true
-{% endif %}
       volumes:
         - name: config-volume
           configMap:
             name: resultsdb-ci-listener-cfg
-{% if deployment_type is defined and deployment_type not in ['local', 'dev']%}
         - name: fedora-messaging-config-volume
           configMap:
             name: fedora-messaging-configmap
@@ -56,6 +53,5 @@ spec:
         - name: fedora-messaging-key-volume
           secret:
             secretName: resultsdb-ci-listener-fedora-messaging-key
-{% endif %}
   triggers:
-    - type: ConfigChange
\ No newline at end of file
+    - type: ConfigChange