diff --git a/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml b/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml
index 1e051efe98..3531f242c5 100644
--- a/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml
+++ b/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml
@@ -50,15 +50,18 @@ items:
           - name: config-volume
             mountPath: /etc/anitya
             readOnly: true
-          - name: fedmsg-config-volume
-            mountPath: /etc/fedmsg.d/
-            readOnly: true
-          - name: fedmsg-key-volume
-            mountPath: /etc/pki/fedmsg/key
-            readOnly: true
-          - name: fedmsg-crt-volume
-            mountPath: /etc/pki/fedmsg/crt
+          - name: fedora-messaging-config-volume
+            mountPath: /etc/fedora-messaging
             readOnly: true
+#          - name: fedmsg-config-volume
+#            mountPath: /etc/fedmsg.d/
+#            readOnly: true
+#          - name: fedmsg-key-volume
+#            mountPath: /etc/pki/fedmsg/key
+#            readOnly: true
+#          - name: fedmsg-crt-volume
+#            mountPath: /etc/pki/fedmsg/crt
+#            readOnly: true
           readinessProbe:
             timeoutSeconds: 1
             initialDelaySeconds: 5
@@ -75,15 +78,18 @@ items:
         - name: config-volume
           configMap:
             name: release-monitoring-configmap
-        - name: fedmsg-config-volume
+        - name: fedora-messaging-config-volume
           configMap:
-            name: fedmsg-configmap
-        - name: fedmsg-key-volume
-          secret:
-            secretName: release-monitoring-fedmsg-key
-        - name: fedmsg-crt-volume
-          secret:
-            secretName: release-monitoring-fedmsg-cert
+            name: fedora-messaging-configmap
+#        - name: fedmsg-config-volume
+#          configMap:
+#            name: fedmsg-configmap
+#        - name: fedmsg-key-volume
+#          secret:
+#            secretName: release-monitoring-fedmsg-key
+#        - name: fedmsg-crt-volume
+#          secret:
+#            secretName: release-monitoring-fedmsg-cert
     triggers:
     - imageChangeParams:
         automatic: true
diff --git a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
index 72d3aa5fef..1e42a04de8 100644
--- a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
+++ b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
@@ -23,6 +23,8 @@ items:
                 python3-blinker \
                 python3-dateutil \
                 python3-fedmsg \
+                fedora-messaging \
+                python3-fedora-messaging \
                 python3-flask \
                 python3-flask-wtf \
                 python3-flask-login \
@@ -62,6 +64,8 @@ items:
                 cp files/anitya_cron.py /usr/local/bin/ && \
                 pip-3 install . && \
                 popd && \
+                pushd anitya_schema && \
+                pip-3 install . && \
                 rm -rf anitya
         RUN rm /etc/fedmsg.d/*py
         RUN mkdir /httpdir
diff --git a/roles/openshift-apps/release-monitoring/templates/configmap.yml b/roles/openshift-apps/release-monitoring/templates/configmap.yml
index 0ec75c8a04..a8a721eed6 100644
--- a/roles/openshift-apps/release-monitoring/templates/configmap.yml
+++ b/roles/openshift-apps/release-monitoring/templates/configmap.yml
@@ -214,6 +214,22 @@ items:
       WSGIPassAuthorization On
     anitya.wsgi: |-
       from anitya.wsgi import application
+- apiVersion: v1
+  kind: ConfigMap
+  metadata:
+    name: fedora-messaging-configmap
+    labels:
+      app: release-monitoring
+  data:
+    config.toml: |-
+      amqp_url = "amqps://messaging-bridge{{ env_suffix }}.fedoraproject.org:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/%2Fpubsub"
+
+      # Until we have certificates it is better to just comment this
+      #[tls]
+      #ca_cert = "/etc/pki/rabbitmq/ca/rabbitmq-ca.crt"
+      #keyfile = "/etc/pki/rabbitmq/key/rabbitmq-fedmsg-migration-tools.key"
+      #certfile = "/etc/pki/rabbitmq/crt/rabbitmq-fedmsg-migration-tools.crt"
+
 - apiVersion: v1
   kind: ConfigMap
   metadata: