diff --git a/ansible/roles/apps/tasks/cert-manager.yml b/ansible/roles/apps/tasks/cert-manager.yml
index 7bcf98be21241b1ab37babbe908997cd12c38fb9..055cb85c47692ab91b4d43293d87f5fc7b68b3c4 100644
--- a/ansible/roles/apps/tasks/cert-manager.yml
+++ b/ansible/roles/apps/tasks/cert-manager.yml
@@ -54,4 +54,10 @@
     flux:
       name: "cert-manager-settings"
       namespace: "oas"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - cert-manager
diff --git a/ansible/roles/apps/tasks/local-storage.yml b/ansible/roles/apps/tasks/local-storage.yml
index 99b67ed82409459696fe30c40b0cbb394619de73..22e9c132505d781c73ca56e5bc273f22e111a090 100644
--- a/ansible/roles/apps/tasks/local-storage.yml
+++ b/ansible/roles/apps/tasks/local-storage.yml
@@ -8,4 +8,10 @@
     flux:
       name: "local-storage-settings"
       namespace: "oas"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - local-storage
diff --git a/ansible/roles/apps/tasks/nextcloud.yml b/ansible/roles/apps/tasks/nextcloud.yml
index fe12a318dfb2186e7507759b8eed36abdca3475d..a591e63c50319434617dc04803d15e76ee9631c2 100644
--- a/ansible/roles/apps/tasks/nextcloud.yml
+++ b/ansible/roles/apps/tasks/nextcloud.yml
@@ -7,7 +7,13 @@
   vars:
     flux:
       name: "nextcloud-settings"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - nextcloud
 
 - name: Create persistent volumes for nextcloud data and metadata
   tags:
@@ -19,9 +25,19 @@
       name: "nextcloud-{{ item.name }}"
       namespace: "oas-apps"
       size: "{{ item.size }}"
-  include_tasks: pvc.yml
+  include_tasks:
+    file: pvc.yml
+    apply:
+      tags:
+        - config
+        - nextcloud
+        - storage
   with_items:
     - name: "files"
       size: 2Gi
     - name: "mariadb"
       size: 512Mi
+    - name: "rabbitmq"
+      size: 8Gi
+    - name: "redis"
+      size: 8Gi
diff --git a/ansible/roles/apps/tasks/nginx.yml b/ansible/roles/apps/tasks/nginx.yml
index 4e4f75bc6cbd626e618775457256dc88d4828192..99c019ba8befa6404414ecf807d7185c55b59b59 100644
--- a/ansible/roles/apps/tasks/nginx.yml
+++ b/ansible/roles/apps/tasks/nginx.yml
@@ -9,4 +9,10 @@
     flux:
       name: "ingress-settings"
       namespace: "oas"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - nginx
diff --git a/ansible/roles/apps/tasks/prometheus.yml b/ansible/roles/apps/tasks/prometheus.yml
index dbf3e64e22aca3b58929cd91274361d035609dbe..af180c9755811d24db8de79a341fc330e8174f84 100644
--- a/ansible/roles/apps/tasks/prometheus.yml
+++ b/ansible/roles/apps/tasks/prometheus.yml
@@ -40,4 +40,11 @@
     flux:
       name: "monitoring-settings"
       namespace: "oas"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - monitoring
+        - prometheus
diff --git a/ansible/roles/apps/tasks/pvc.yml b/ansible/roles/apps/tasks/pvc.yml
index 96eda6c6be74a9da73b4bb4da576c9a1840a6382..768c993338110fd36b0870c47efc23fdf87441b2 100644
--- a/ansible/roles/apps/tasks/pvc.yml
+++ b/ansible/roles/apps/tasks/pvc.yml
@@ -1,7 +1,5 @@
 ---
 - name: Create Persistent Volume Claim for application
-  tags:
-    - storage
   k8s:
     state: present
     definition:
diff --git a/ansible/roles/apps/tasks/rocketchat.yml b/ansible/roles/apps/tasks/rocketchat.yml
index f5f28ffbe8bb0825f802e18db49453e31c083cf0..5efe0efd3a25f053acacab6337f6087994f58d72 100644
--- a/ansible/roles/apps/tasks/rocketchat.yml
+++ b/ansible/roles/apps/tasks/rocketchat.yml
@@ -8,4 +8,10 @@
   vars:
     flux:
       name: "rocketchat-settings"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - rocketchat
diff --git a/ansible/roles/apps/tasks/single-sign-on.yml b/ansible/roles/apps/tasks/single-sign-on.yml
index 799fb19495906fc02fbd30ec9c044f557a42e309..69a5c96988011ca16fb9c56a35f885d75577db57 100644
--- a/ansible/roles/apps/tasks/single-sign-on.yml
+++ b/ansible/roles/apps/tasks/single-sign-on.yml
@@ -9,4 +9,10 @@
     flux:
       name: "single-sign-on-settings"
       namespace: "oas"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - single-sign-on
diff --git a/ansible/roles/apps/tasks/wordpress.yml b/ansible/roles/apps/tasks/wordpress.yml
index 01042bebafecd57f01cdc818eb4405a92d0014b7..65f54fc0fa2209c7ba1c9e1f0cf848916470c961 100644
--- a/ansible/roles/apps/tasks/wordpress.yml
+++ b/ansible/roles/apps/tasks/wordpress.yml
@@ -7,7 +7,14 @@
   vars:
     flux:
       name: "wordpress-settings"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - wordpress
+
 
 - name: Create persistent volumes for wordpress data and metadata
   tags:
@@ -19,7 +26,13 @@
       name: "wordpress-{{ item.name }}"
       namespace: "oas-apps"
       size: "{{ item.size }}"
-  include_tasks: pvc.yml
+  include_tasks:
+    file: pvc.yml
+    apply:
+      tags:
+        - config
+        - wordpress
+        - storage
   with_items:
     - name: "files"
       size: 2Gi
diff --git a/ansible/roles/apps/templates/nextcloud-settings.yaml b/ansible/roles/apps/templates/nextcloud-settings.yaml
index 679a8177a3febfcb25b380211e6ab5a7f57db847..4844025c29a8171d60e551405e3f75cf54a12545 100644
--- a/ansible/roles/apps/templates/nextcloud-settings.yaml
+++ b/ansible/roles/apps/templates/nextcloud-settings.yaml
@@ -90,6 +90,12 @@ postgresql:
 rabbitmq:
   rabbitmq:
     password: "{{ onlyoffice_rabbitmq_password }}"
+  persistence:
+    existingClaim: "nextcloud-rabbitmq"
+
+redis:
+  persistence:
+    existingClaim: "nextcloud-redis"
 
 sociallogin:
   server_name: "sso.{{ domain }}"