diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml
index 63b30f8a10..647beed12b 100644
--- a/playbooks/groups/value.yml
+++ b/playbooks/groups/value.yml
@@ -44,7 +44,7 @@
     process: fedmsg-irc
   - {role: mote,
      when: inventory_hostname.startswith('value01')}
-  - {role: nfs/client, when: env != "staging", nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3", mnt_dir: '/srv/', nfs_src_dir: 'fedora_value_prod'}
+  - {role: nfs/client, nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3", mnt_dir: '/srv/', nfs_src_dir: 'fedora_value_{{env_short}}'}
 
   pre_tasks:
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
diff --git a/playbooks/openshift-apps/maubot.yml b/playbooks/openshift-apps/maubot.yml
index ba01247d36..a9673c9c72 100644
--- a/playbooks/openshift-apps/maubot.yml
+++ b/playbooks/openshift-apps/maubot.yml
@@ -41,6 +41,11 @@
     file: storage.yml
     objectname: storage.yml
 
+  - role: openshift/object
+    app: maubot
+    template: meetbot-logs-volume.yml
+    objectname: meetbot-logs-volume.yml
+
   - role: openshift/object
     app: maubot
     template: configmap.yml
diff --git a/playbooks/openshift-apps/mote.yml b/playbooks/openshift-apps/mote.yml
index ffa311fc76..784999a17e 100644
--- a/playbooks/openshift-apps/mote.yml
+++ b/playbooks/openshift-apps/mote.yml
@@ -15,6 +15,7 @@
     appowners:
     - darknao
     - t0xic0der
+    - ryanlerch
     tags:
     - appowners
 
diff --git a/roles/openshift-apps/maubot/files/deploymentconfig.yml b/roles/openshift-apps/maubot/files/deploymentconfig.yml
index 9efa3becc1..bd7fa2fd8d 100644
--- a/roles/openshift-apps/maubot/files/deploymentconfig.yml
+++ b/roles/openshift-apps/maubot/files/deploymentconfig.yml
@@ -28,6 +28,8 @@ spec:
               readOnly: true
             - name: maubot-storage
               mountPath: /maubot
+            - name: meetbot-logs
+              mountPath: /meetbot_logs
             - name: ipa-config-volume
               mountPath: /etc/ipa
               readOnly: true
@@ -53,6 +55,9 @@ spec:
         - name: maubot-storage
           persistentVolumeClaim:
             claimName: maubot-storage
+        - name: meetbot-logs
+          persistentVolumeClaim:
+            claimName: meetbot-logs
         - name: ipa-config-volume
           configMap:
             name: ipa-client-config
diff --git a/roles/openshift-apps/maubot/templates/meetbot-logs-volume.yml b/roles/openshift-apps/maubot/templates/meetbot-logs-volume.yml
new file mode 100644
index 0000000000..ba168f735e
--- /dev/null
+++ b/roles/openshift-apps/maubot/templates/meetbot-logs-volume.yml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: meetbot-logs
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 5Gi
+  storageClassName: ""
+  volumeName: fedora-value-{{env_short}}
diff --git a/roles/openshift-apps/mote/templates/pvc.yml b/roles/openshift-apps/mote/templates/pvc.yml
index 3bedbe3438..b3fcfe60f4 100644
--- a/roles/openshift-apps/mote/templates/pvc.yml
+++ b/roles/openshift-apps/mote/templates/pvc.yml
@@ -3,21 +3,11 @@ kind: PersistentVolumeClaim
 metadata:
   name: meetbot-storage
 spec:
-{% if env == 'staging' %}
-  # For stg, we use a simple ceph volume
-  accessModes:
-  - ReadWriteMany
-  resources:
-    requests:
-      storage: 1Gi
-  storageClassName: ocs-storagecluster-cephfs
-{% else %}
-  # On prod, we use a nfs volume shared with meetbot on value02
+  # we use a nfs volume shared with meetbot on value02
   accessModes:
   - ReadWriteMany
   resources:
     requests:
       storage: 5Gi
   storageClassName: ""
-  volumeName: fedora-value-prod
-{% endif %}
+  volumeName: fedora-value-{{env_short}}