diff --git a/roles/openshift-apps/fmn/templates/consumer.toml b/roles/openshift-apps/fmn/templates/consumer.toml
index 7b78ac0243..bedb54d98f 100644
--- a/roles/openshift-apps/fmn/templates/consumer.toml
+++ b/roles/openshift-apps/fmn/templates/consumer.toml
@@ -3,9 +3,9 @@ callback = "fmn.consumer:Consumer"
 passive_declares = true
 
 [tls]
-ca_cert = "/etc/pki/rabbitmq/ca/rabbitmq-ca.crt"
-keyfile = "/etc/pki/rabbitmq/key/rabbitmq-fmn.key"
-certfile = "/etc/pki/rabbitmq/crt/rabbitmq-fmn.crt"
+ca_cert = "/etc/pki/fedora-messaging/ca/cacert.pem"
+certfile = "/etc/pki/fedora-messaging/crt/fmn-cert.pem"
+keyfile = "/etc/pki/fedora-messaging/key/fmn-key.pem"
 
 
 [client_properties]
diff --git a/roles/openshift-apps/fmn/templates/deploymentconfig.yml b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
index d8300b7c11..2948726473 100644
--- a/roles/openshift-apps/fmn/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
@@ -159,14 +159,14 @@ spec:
             - name: etc-fmn
               mountPath: "/etc/fmn"
               readOnly: true
-            - name: rabbitmq-ca-volume
-              mountPath: /etc/pki/rabbitmq/ca
+            - name: fedora-messaging-ca-volume
+              mountPath: /etc/pki/fedora-messaging/ca
               readOnly: true
-            - name: rabbitmq-key-volume
-              mountPath: /etc/pki/rabbitmq/key
+            - name: fedora-messaging-key-volume
+              mountPath: /etc/pki/fedora-messaging/key
               readOnly: true
-            - name: rabbitmq-crt-volume
-              mountPath: /etc/pki/rabbitmq/crt
+            - name: fedora-messaging-crt-volume
+              mountPath: /etc/pki/fedora-messaging/crt
               readOnly: true
           env:
             - name: APP_SCRIPT
@@ -175,15 +175,15 @@ spec:
         - name: etc-fmn
           configMap:
             name: fmn
-        - name: rabbitmq-ca-volume
-          mountPath: /etc/pki/rabbitmq/ca
-          readOnly: true
-        - name: rabbitmq-key-volume
-          mountPath: /etc/pki/rabbitmq/key
-          readOnly: true
-        - name: rabbitmq-crt-volume
-          mountPath: /etc/pki/rabbitmq/crt
-          readOnly: true
+        - name: fedora-messaging-ca-volume
+          secret:
+            secretName: fedora-messaging-ca
+        - name: fedora-messaging-key-volume
+          secret:
+            secretName: fedora-messaging-key
+        - name: fedora-messaging-crt-volume
+          secret:
+            secretName: fedora-messaging-crt
   triggers:
     - type: ImageChange
       imageChangeParams:
diff --git a/roles/openshift-apps/fmn/templates/sender.toml b/roles/openshift-apps/fmn/templates/sender.toml
index e99236df8b..ccf1f36354 100644
--- a/roles/openshift-apps/fmn/templates/sender.toml
+++ b/roles/openshift-apps/fmn/templates/sender.toml
@@ -3,6 +3,11 @@
 amqp_url = "amqps://fmn{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Ffmn"
 queue = "email"
 
+[tls]
+ca_cert = "/etc/pki/fedora-messaging/ca/cacert.pem"
+certfile = "/etc/pki/fedora-messaging/crt/fmn-cert.pem"
+keyfile = "/etc/pki/fedora-messaging/key/fmn-key.pem"
+
 [handler]
 class = "fmn.sender.email:EmailHandler"
 # class = "fmn.sender.irc:IRCHandler"