diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 096db8e0cb29b80115ab08b3b35f270ebf775ddf..4716f577f63a7e97fc5efc13b42cf0179fad99b3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,6 +6,8 @@ repos:
       - id: check-ast
       - id: check-merge-conflict
       - id: check-yaml
+        args:
+          - --allow-multiple-documents
       - id: detect-private-key
       - id: end-of-file-fixer
       - id: trailing-whitespace
diff --git a/flux2/apps/rocketchat/kustomization.yaml b/flux2/apps/rocketchat/kustomization.yaml
index 835ce5fef882f0aa6d74f2ca52346df2cd028acf..58e94f6591eda2885ed37473ecddbc64947fee41 100644
--- a/flux2/apps/rocketchat/kustomization.yaml
+++ b/flux2/apps/rocketchat/kustomization.yaml
@@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: oas-apps
 resources:
+  - pvc.yaml
   - release.yaml
   - rocketchat-values-configmap.yaml
diff --git a/flux2/apps/rocketchat/pvc.yaml b/flux2/apps/rocketchat/pvc.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..03dd9a387099692f5dcf68a47be9cd7a2011fde2
--- /dev/null
+++ b/flux2/apps/rocketchat/pvc.yaml
@@ -0,0 +1,30 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: rocketchat-data
+  labels:
+    openappstack.net/backupSet: "rocketchat"
+spec:
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: local-path
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: rocketchat-mongodb
+  labels:
+    openappstack.net/backupSet: "rocketchat"
+spec:
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: local-path
diff --git a/flux2/apps/rocketchat/rocketchat-values-configmap.yaml b/flux2/apps/rocketchat/rocketchat-values-configmap.yaml
index 38ad797bb1c041278a6763e0a7db971211693f04..8888f39a959a5e8ba014502a28068e1e9709ebef 100644
--- a/flux2/apps/rocketchat/rocketchat-values-configmap.yaml
+++ b/flux2/apps/rocketchat/rocketchat-values-configmap.yaml
@@ -88,10 +88,7 @@ data:
 
     persistence:
       enabled: true
-      size: 1Gi
-      # FIXME: This valuee leads to an unused PVC, which helm-controller does
-      # not like.
-      # existingClaim: "rocketchat-data"
+      existingClaim: "rocketchat-data"
 
     podAnnotations:
       # Let the backup system include rocketchat data.
@@ -114,8 +111,7 @@ data:
         backup.velero.io/backup-volumes: "datadir"
       persistence:
         enabled: true
-        # FIXME: This value is ignored by the chart currently in use
-        # existingClaim: "rocketchat-mongodb"
+        existingClaim: "rocketchat-mongodb"
       resources:
         limits:
           cpu: 600m