diff --git a/playbooks/openshift-apps/mdapi.yml b/playbooks/openshift-apps/mdapi.yml
index c232fb403d..30bf6faabf 100644
--- a/playbooks/openshift-apps/mdapi.yml
+++ b/playbooks/openshift-apps/mdapi.yml
@@ -26,6 +26,11 @@
     template: buildconfig.yml
     objectname: buildconfig.yml
 
+  - role: openshift/object
+    app: mdapi
+    file: storage.yml
+    objectname: storage.yml
+
   - role: openshift/object
     app: mdapi
     template: configmap.yml
diff --git a/roles/openshift-apps/mdapi/files/cron.yml b/roles/openshift-apps/mdapi/files/cron.yml
index 50c5896929..7acc472aff 100644
--- a/roles/openshift-apps/mdapi/files/cron.yml
+++ b/roles/openshift-apps/mdapi/files/cron.yml
@@ -22,10 +22,18 @@ spec:
               readOnly: true
             - mountPath: /var/tmp
               name: data-volume
+            - mountPath: /etc/fedora-messaging/
+              name: fedora-messaging-config-volume
+              readOnly: true
           restartPolicy: Never
           volumes:
-          - configMap:
-              defaultMode: 420
-              name: mdapi-configmap
-            name: config-volume
+          - name: config-volume
+            configMap:
+                defaultMode: 420
+                name: mdapi-configmap
           - name: data-volume
+            persistentVolumeClaim:
+                claimName: mdapi-storage
+          - name: fedora-messaging-config-volume
+            configMap:
+              name: fedora-messaging-configmap
diff --git a/roles/openshift-apps/mdapi/files/deploymentconfig.yml b/roles/openshift-apps/mdapi/files/deploymentconfig.yml
index cdda640bc7..979c8842eb 100644
--- a/roles/openshift-apps/mdapi/files/deploymentconfig.yml
+++ b/roles/openshift-apps/mdapi/files/deploymentconfig.yml
@@ -46,6 +46,8 @@ spec:
          configMap:
            name: mdapi-configmap
        - name: data-volume
+         persistentVolumeClaim:
+           claimName: mdapi-storage
   triggers:
   - type: ImageChange
     imageChangeParams:
diff --git a/roles/openshift-apps/mdapi/files/storage.yml b/roles/openshift-apps/mdapi/files/storage.yml
new file mode 100644
index 0000000000..0223d139af
--- /dev/null
+++ b/roles/openshift-apps/mdapi/files/storage.yml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: mdapi-storage
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 10Gi
diff --git a/roles/openshift-apps/mdapi/templates/buildconfig.yml b/roles/openshift-apps/mdapi/templates/buildconfig.yml
index 2eb8e988ad..e50b76c1cd 100644
--- a/roles/openshift-apps/mdapi/templates/buildconfig.yml
+++ b/roles/openshift-apps/mdapi/templates/buildconfig.yml
@@ -7,9 +7,9 @@ metadata:
 spec:
   source:
     git:
-      uri: https://pagure.io/forks/cverna/mdapi.git
+      uri: https://pagure.io/mdapi.git
 {% if env == 'staging' %}
-      ref: "container_app"
+      ref: "master"
 {% else %}
       ref: "production"
 {% endif %}
diff --git a/roles/openshift-apps/mdapi/templates/configmap.yml b/roles/openshift-apps/mdapi/templates/configmap.yml
index 4250152f96..913e95f371 100644
--- a/roles/openshift-apps/mdapi/templates/configmap.yml
+++ b/roles/openshift-apps/mdapi/templates/configmap.yml
@@ -17,3 +17,18 @@ data:
     KOJI_REPO = 'https://koji.fedoraproject.org/repos/'
     DL_SERVER = 'http://dl.phx2.fedoraproject.org'
 {% endif %}
+  config.toml: |-
+    amqp_url = "amqps://messaging-bridge{{ env_suffix }}.fedoraproject.org:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/%2Fpubsub"
+    publish_exchange = "amq.topic"
+
+    [tls]
+    ca_cert = "/etc/pki/rabbitmq/ca/rabbitmq-ca.crt"
+    keyfile = "/etc/pki/rabbitmq/key/rabbitmq-NAME_OF_CERT.key"
+    certfile = "/etc/pki/rabbitmq/crt/rabbitmq-NAME_OF_CERT.crt"
+
+    [client_properties]
+    app = "mdapi"
+
+    [qos]
+    prefetch_size = 0
+    prefetch_count = 25