diff --git a/ansible/roles/apps/tasks/rocketchat.yml b/ansible/roles/apps/tasks/rocketchat.yml
index 514e402a87bdd76881e8b2ac0458acca369f61e6..875e52872925771aca358e54e446d5d19678e4a3 100644
--- a/ansible/roles/apps/tasks/rocketchat.yml
+++ b/ansible/roles/apps/tasks/rocketchat.yml
@@ -15,3 +15,24 @@
         - config
         - flux
         - rocketchat
+
+- name: Create persistent volumes for rocketchat data
+  tags:
+    - config
+    - rocketchat
+    - storage
+  vars:
+    pvc:
+      name: "rocketchat-{{ item.name }}"
+      namespace: "oas-apps"
+      size: "{{ item.size }}"
+  include_tasks:
+    file: pvc.yml
+    apply:
+      tags:
+        - config
+        - rocketchat
+        - storage
+  with_items:
+    - name: "data"
+      size: 1Gi
diff --git a/ansible/roles/apps/templates/settings/rocketchat.yaml b/ansible/roles/apps/templates/settings/rocketchat.yaml
index bd0ad831cd83384eb077ac058c175ff85bc21334..17153b664fa8823b5676209cda6eef9922e92c51 100644
--- a/ansible/roles/apps/templates/settings/rocketchat.yaml
+++ b/ansible/roles/apps/templates/settings/rocketchat.yaml
@@ -82,6 +82,7 @@ ingress:
 persistence:
   enabled: true
   size: 1Gi
+  existingClaim: "rocketchat-data"
 
 podAnnotations:
   # Let the backup system include rocketchat data.
@@ -93,6 +94,9 @@ mongodb:
   podAnnotations:
     # Let the backup system include rocketchat data stored in mongodb.
     backup.velero.io/backup-volumes: "datadir"
+  persistence:
+    enabled: true
+    size: 2Gi
 
 image:
   repository: open.greenhost.net:4567/openappstack/openappstack/rocketchat
diff --git a/flux/oas-apps/rocketchat.yaml b/flux/oas-apps/rocketchat.yaml
index ddfc10b22449f4ed8beb0204c4013ac7b6376b2d..2a0da13e5abf0dfa529489b638f5f41d4d0ef3e4 100644
--- a/flux/oas-apps/rocketchat.yaml
+++ b/flux/oas-apps/rocketchat.yaml
@@ -11,10 +11,9 @@ spec:
   chart:
     repository: https://kubernetes-charts.storage.googleapis.com/
     name: rocketchat
-    version: 2.0.2
+    version: 2.0.6
   valuesFrom:
     - secretKeyRef:
         name: rocketchat-settings
         key: values.yaml
   timeout: 300
-