diff --git a/apps/bitwarden/bitwarden-deployment.yaml b/apps/bitwarden/bitwarden-deployment.yaml
index 59131db..4394403 100644
--- a/apps/bitwarden/bitwarden-deployment.yaml
+++ b/apps/bitwarden/bitwarden-deployment.yaml
@@ -46,9 +46,7 @@ spec:
         terminationMessagePolicy: File
         volumeMounts:
         - mountPath: /data
-          name: bitwarden-data
-        - mountPath: /persistentvolumes
-          name: nfs-client-root
+          name: bitwarden-data-nfs
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
@@ -58,10 +56,6 @@ spec:
         runAsUser: 0
       terminationGracePeriodSeconds: 30
       volumes:
-      - name: bitwarden-data
+      - name: bitwarden-data-nfs
         persistentVolumeClaim:
-          claimName: bitwarden
-      - name: nfs-client-root
-        nfs:
-          path: /volume1/k8s
-          server: 192.168.1.176
+          claimName: bitwarden-nfs
diff --git a/apps/bitwarden/bitwarden-storage.yaml b/apps/bitwarden/bitwarden-storage.yaml
index 2cbfc05..424fe48 100644
--- a/apps/bitwarden/bitwarden-storage.yaml
+++ b/apps/bitwarden/bitwarden-storage.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: bitwarden
+  name: bitwarden-nfs
   namespace: default
 spec:
-  storageClassName: synology-iscsi-storage-custom
+  storageClassName: nfs-client
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
       storage: 5Gi
diff --git a/apps/gittea/gitea-deployment.yaml b/apps/gittea/gitea-deployment.yaml
index 3e50da1..a98e457 100644
--- a/apps/gittea/gitea-deployment.yaml
+++ b/apps/gittea/gitea-deployment.yaml
@@ -33,24 +33,30 @@ spec:
         - containerPort: 22
           name: gitea-ssh
           protocol: TCP
+        env:
+          - name: USER_UID
+            value: "1000"
+          - name: USER_GID
+            value: "1000"
         resources: {}
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
         volumeMounts:
         - mountPath: /data
-          name: gitea-storage
-        - mountPath: /persistentvolumes
-          name: nfs-client-root
+          name: gitea-storage-iscsi
+        - mountPath: /data2
+          name: gitea-storage-nfs2
+#        - mountPath: /data-new
+#          name: gitea-storage-nfs
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 30
       volumes:
-      - name: gitea-storage
+      - name: gitea-storage-iscsi
         persistentVolumeClaim:
-          claimName: gitea
-      - name: nfs-client-root
-        nfs:
-          path: /volume1/k8s
-          server: 192.168.1.176
+          claimName: gitea-storage-iscsi
+      - name: gitea-storage-nfs2
+        persistentVolumeClaim:
+          claimName: gitea-nfs2
diff --git a/apps/gittea/gitea-storage.yaml b/apps/gittea/gitea-storage.yaml
index 43c967f..055f6e5 100644
--- a/apps/gittea/gitea-storage.yaml
+++ b/apps/gittea/gitea-storage.yaml
@@ -1,12 +1,25 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: gitea
+  name: gitea-storage-iscsi
   namespace: default
 spec:
   storageClassName: synology-iscsi-storage-custom
   accessModes:
-  - ReadWriteMany
+    - ReadWriteOnce
   resources:
     requests:
       storage: 20Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: gitea-nfs2
+  namespace: default
+spec:
+  storageClassName: nfs-client
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 20Gi
\ No newline at end of file
diff --git a/apps/gittea/runner-deployment.yaml b/apps/gittea/runner-deployment.yaml
new file mode 100644
index 0000000..ce03908
--- /dev/null
+++ b/apps/gittea/runner-deployment.yaml
@@ -0,0 +1,46 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: act-runner
+  name: act-runner
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: act-runner
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        app: act-runner
+    spec:
+      restartPolicy: Always
+      volumes:
+        - name: runner-data-nfs
+          persistentVolumeClaim:
+            claimName: runner-data-nfs
+      securityContext:
+        fsGroup: 1000
+      containers:
+        - name: runner
+          image: vegardit/gitea-act-runner:dind-latest
+          imagePullPolicy: Always
+          # command: ["sh", "-c", "while ! nc -z localhost 2376 </dev/null; do echo 'waiting for docker daemon...'; sleep 5; done; /sbin/tini -- /opt/act/run.sh"]
+          env:
+            - name: GITEA_RUNNER_JOB_CONTAINER_PRIVILEGED
+              value: "true"
+            - name: GITEA_RUNNER_JOB_CONTAINER_NETWORK
+              value: "host"
+            - name: GITEA_INSTANCE_URL
+              value: http://gitea-service:80
+            - name: GITEA_RUNNER_REGISTRATION_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: runner-secret
+                  key: token
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - name: runner-data-nfs
+              mountPath: /data
diff --git a/apps/home-assistant/home-assistance-deploy.yaml b/apps/home-assistant/home-assistance-deploy.yaml
index a578a3b..48083a3 100644
--- a/apps/home-assistant/home-assistance-deploy.yaml
+++ b/apps/home-assistant/home-assistance-deploy.yaml
@@ -43,13 +43,13 @@ spec:
         terminationMessagePolicy: File
         volumeMounts:
         - mountPath: /config
-          name: home-assistants-config
+          name: home-assistants-config-nfs
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 30
       volumes:
-      - name: home-assistants-config
+      - name: home-assistants-config-nfs
         persistentVolumeClaim:
-          claimName: home-assistants-config
+          claimName: home-assistants-config-nfs
\ No newline at end of file
diff --git a/apps/home-assistant/home-assistance-storage.yaml b/apps/home-assistant/home-assistance-storage.yaml
index a5345fc..b718ae3 100644
--- a/apps/home-assistant/home-assistance-storage.yaml
+++ b/apps/home-assistant/home-assistance-storage.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: home-assistants-config
+  name: home-assistants-config-nfs
   namespace: default
 spec:
-  storageClassName: synology-iscsi-storage-custom
+  storageClassName: nfs-client
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
-      storage: 5Gi
+      storage: 5Gi
\ No newline at end of file
diff --git a/apps/ingress/ingress.yaml b/apps/ingress/ingress.yaml
index 4ec325d..18d3471 100644
--- a/apps/ingress/ingress.yaml
+++ b/apps/ingress/ingress.yaml
@@ -31,10 +31,10 @@ spec:
         pathType: Prefix
       - backend:
           service:
-            name: prometheus-server
+            name: prowlarr-service
             port:
-              number: 80
-        path: /metric
+              number: 9696
+        path: /prowlarr
         pathType: Prefix
       - backend:
           service:
@@ -43,31 +43,3 @@ spec:
               number: 8091
         path: /zwave
         pathType: Prefix
-      - backend:
-          service:
-            name: immich-server
-            port:
-              number: 2283
-        path: /immich
-        pathType: Prefix
-      - backend:
-          service:
-            name: overseerr-service
-            port:
-              number: 5055
-        path: /overseerr
-        pathType: Prefix
-      - backend:
-          service:
-            name: tautulli-service
-            port:
-              number: 8181
-        path: /tautulli
-        pathType: Prefix
-      - backend:
-          service:
-            name: home-assistants-service
-            port:
-              number: 7123
-        path: /ha
-        pathType: Prefix
diff --git a/apps/minio/mini-ui-ingress.yaml b/apps/minio/mini-ui-ingress.yaml
new file mode 100644
index 0000000..8125ef2
--- /dev/null
+++ b/apps/minio/mini-ui-ingress.yaml
@@ -0,0 +1,27 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    acme.cert-manager.io/http01-edit-in-place: "true"
+    cert-manager.io/issuer: letsencrypt-prod
+    kubernetes.io/ingress.class: nginx
+    nginx.org/client-max-body-size: "0"
+    nginx.ingress.kubernetes.io/proxy-body-size: "0"
+  name: minio-ui-ingress
+  namespace: default
+spec:
+  rules:
+    - host: s3ui.lilpenguins.com
+      http:
+        paths:
+          - backend:
+              service:
+                name: minio-service
+                port:
+                  number: 9001
+            path: /
+            pathType: Prefix
+  tls:
+    - hosts:
+        - s3ui.lilpenguins.com
+      secretName: minio-ui-tls-prod
diff --git a/apps/nzbget/nzbget-deployment.yaml b/apps/nzbget/nzbget-deployment.yaml
index c4205f3..d78908b 100644
--- a/apps/nzbget/nzbget-deployment.yaml
+++ b/apps/nzbget/nzbget-deployment.yaml
@@ -41,7 +41,7 @@ spec:
         terminationMessagePolicy: File
         volumeMounts:
         - mountPath: /config
-          name: nzbget-config
+          name: nzbget-config-nfs
         - mountPath: /downloads
           name: nzbget-downloads
         - mountPath: /tv
@@ -50,17 +50,15 @@ spec:
           name: nfs-movies
         - mountPath: /books
           name: nfs-books
-        - mountPath: /persistentvolumes
-          name: nfs-client-root
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 30
       volumes:
-      - name: nzbget-config
+      - name: nzbget-config-nfs
         persistentVolumeClaim:
-          claimName: nzbget-config
+          claimName: nzbget-config-nfs
       - name: nzbget-downloads
         emptyDir:
           sizeLimit: 200Gi
@@ -76,7 +74,4 @@ spec:
         nfs:
           path: /volume2/vol2/Ebooks/
           server: 192.168.1.78
-      - name: nfs-client-root
-        nfs:
-          path: /volume1/k8s
-          server: 192.168.1.176
+
diff --git a/apps/nzbget/nzbget-storage.yaml b/apps/nzbget/nzbget-storage.yaml
index 45fdc76..d9c2e8d 100644
--- a/apps/nzbget/nzbget-storage.yaml
+++ b/apps/nzbget/nzbget-storage.yaml
@@ -1,26 +1,14 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: nzbget-config
+  name: nzbget-config-nfs
   namespace: default
 spec:
-  storageClassName: synology-iscsi-storage
+  storageClassName: nfs-client
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
       storage: 1Gi
 
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: nzbget-downloads
-  namespace: default
-spec:
-  storageClassName: synology-iscsi-storage
-  accessModes:
-  - ReadWriteMany
-  resources:
-    requests:
-      storage: 500Gi
+
diff --git a/apps/overseerr/overseerr-deployment.yaml b/apps/overseerr/overseerr-deployment.yaml
index 083a6b6..87b1472 100644
--- a/apps/overseerr/overseerr-deployment.yaml
+++ b/apps/overseerr/overseerr-deployment.yaml
@@ -34,19 +34,13 @@ spec:
         terminationMessagePolicy: File
         volumeMounts:
         - mountPath: /config
-          name: config
-        - mountPath: /persistentvolumes
-          name: nfs-client-root
+          name: config-nfs
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 30
       volumes:
-      - name: config
+      - name: config-nfs
         persistentVolumeClaim:
-          claimName: overseerr-config
-      - name: nfs-client-root
-        nfs:
-          path: /volume1/k8s
-          server: 192.168.1.176
+          claimName: overseerr-config-nfs
diff --git a/apps/overseerr/overseerr-storage.yaml b/apps/overseerr/overseerr-storage.yaml
index fb7eeb0..ec00f6a 100644
--- a/apps/overseerr/overseerr-storage.yaml
+++ b/apps/overseerr/overseerr-storage.yaml
@@ -1,11 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: overseerr-config
+  name: overseerr-config-nfs
   namespace: default
 spec:
+  storageClassName: nfs-client
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
-      storage: 1Gi
+      storage: 1Gi
\ No newline at end of file
diff --git a/apps/radarr/radarr-deployment.yaml b/apps/radarr/radarr-deployment.yaml
index 05327e1..9506861 100644
--- a/apps/radarr/radarr-deployment.yaml
+++ b/apps/radarr/radarr-deployment.yaml
@@ -34,25 +34,19 @@ spec:
         terminationMessagePolicy: File
         volumeMounts:
         - mountPath: /config
-          name: radarr-config
+          name: radarr-config-nfs
         - mountPath: /movies
           name: nfs-movies
-        - mountPath: /persistentvolumes
-          name: nfs-client-root
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 30
       volumes:
-      - name: radarr-config
+      - name: radarr-config-nfs
         persistentVolumeClaim:
-          claimName: radarr-config
+          claimName: radarr-config-nfs
       - name: nfs-movies
         nfs:
           path: /volume1/Movies
           server: 192.168.1.176
-      - name: nfs-client-root
-        nfs:
-          path: /volume1/k8s
-          server: 192.168.1.176
diff --git a/apps/radarr/radarr-storage.yaml b/apps/radarr/radarr-storage.yaml
index 42de56a..30fc081 100644
--- a/apps/radarr/radarr-storage.yaml
+++ b/apps/radarr/radarr-storage.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: radarr-config
+  name: radarr-config-nfs
   namespace: default
 spec:
-  storageClassName: synology-iscsi-storage-custom
+  storageClassName: nfs-client
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
       storage: 5Gi
diff --git a/apps/retrom/retrom-deployment.yaml b/apps/retrom/retrom-deployment.yaml
index 8a45465..f2bfb32 100644
--- a/apps/retrom/retrom-deployment.yaml
+++ b/apps/retrom/retrom-deployment.yaml
@@ -37,10 +37,10 @@ spec:
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
         volumeMounts:
-        - mountPath: /app/config/
-          name: retrom-config
-        - mountPath: /app/data/
-          name: retrom-data
+        - mountPath: /app/config
+          name: retrom-config-nfs
+        - mountPath: /app/data
+          name: retrom-data-nfs
         - mountPath: /app/library
           name: nfs-roms
       dnsPolicy: ClusterFirst
@@ -49,12 +49,12 @@ spec:
       securityContext: {}
       terminationGracePeriodSeconds: 30
       volumes:
-      - name: retrom-config
+      - name: retrom-config-nfs
         persistentVolumeClaim:
-          claimName: retrom-config
-      - name: retrom-data
+          claimName: retrom-config-nfs
+      - name: retrom-data-nfs
         persistentVolumeClaim:
-          claimName: retrom-data
+          claimName: retrom-data-nfs
       - name: nfs-roms
         nfs:
           path: /volume2/vol2/Downloads/Roms/retrom
diff --git a/apps/retrom/retrom-storage.yaml b/apps/retrom/retrom-storage.yaml
index 1a418e0..9979576 100644
--- a/apps/retrom/retrom-storage.yaml
+++ b/apps/retrom/retrom-storage.yaml
@@ -1,26 +1,25 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: retrom-config
+  name: retrom-config-nfs
   namespace: default
 spec:
-  storageClassName: synology-iscsi-storage-custom
+  storageClassName: nfs-client
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
       storage: 2Gi
-
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: retrom-data
+  name: retrom-data-nfs
   namespace: default
 spec:
-  storageClassName: synology-iscsi-storage-custom
+  storageClassName: nfs-client
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
-      storage: 20Gi
+      storage: 20Gi
\ No newline at end of file
diff --git a/apps/sonarr/sonnarr-deployment.yaml b/apps/sonarr/sonnarr-deployment.yaml
index d795918..fb69927 100644
--- a/apps/sonarr/sonnarr-deployment.yaml
+++ b/apps/sonarr/sonnarr-deployment.yaml
@@ -34,35 +34,25 @@ spec:
         terminationMessagePolicy: File
         volumeMounts:
         - mountPath: /downloads
-          name: downloads
-        - mountPath: /sonarBK
-          name: sonar
+          name: downloads-nfs
         - mountPath: /config
-          name: sonar-config
+          name: sonar-config-nfs
         - mountPath: /tv
           name: nfs-tv
-        - mountPath: /persistentvolumes
-          name: nfs-client-root
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 30
       volumes:
-      - name: downloads
+      - name: downloads-nfs
         persistentVolumeClaim:
-          claimName: sonarr-downloads
-      - name: sonar
+          claimName: sonarr-downloads-nfs
+      - name: sonar-config-nfs
         persistentVolumeClaim:
-          claimName: sonarr
-      - name: sonar-config
-        persistentVolumeClaim:
-          claimName: sonarr-config
+          claimName: sonarr-config-nfs
       - name: nfs-tv
         nfs:
           path: /volume2/vol2/TV/
           server: 192.168.1.78
-      - name: nfs-client-root
-        nfs:
-          path: /volume1/k8s
-          server: 192.168.1.176
+
diff --git a/apps/sonarr/sonnarr-storage.yaml b/apps/sonarr/sonnarr-storage.yaml
index 6f09582..eefcd56 100644
--- a/apps/sonarr/sonnarr-storage.yaml
+++ b/apps/sonarr/sonnarr-storage.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: sonarr
+  name: sonarr-nfs
   namespace: default
 spec:
-  storageClassName: synology-iscsi-storage-custom
+  storageClassName: nfs-client
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
       storage: 1Gi
@@ -15,12 +15,12 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: sonarr-config
+  name: sonarr-config-nfs
   namespace: default
 spec:
-  storageClassName: synology-iscsi-storage-custom
+  storageClassName: nfs-client
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
       storage: 2Gi
@@ -29,12 +29,12 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: sonarr-downloads
+  name: sonarr-downloads-nfs
   namespace: default
 spec:
-  storageClassName: synology-iscsi-storage-custom
+  storageClassName: nfs-client
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
       storage: 50Gi
diff --git a/apps/tautulli/tautulli-deployment.yaml b/apps/tautulli/tautulli-deployment.yaml
index cac2303..cd070bc 100644
--- a/apps/tautulli/tautulli-deployment.yaml
+++ b/apps/tautulli/tautulli-deployment.yaml
@@ -35,19 +35,13 @@ spec:
         terminationMessagePolicy: File
         volumeMounts:
         - mountPath: /config
-          name: tautulli-config
-        - mountPath: /persistentvolumes
-          name: nfs-client-root
+          name: tautulli-config-nfs
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 30
       volumes:
-      - name: tautulli-config
+      - name: tautulli-config-nfs
         persistentVolumeClaim:
-          claimName: 10g-tautulli-config
-      - name: nfs-client-root
-        nfs:
-          path: /volume1/k8s
-          server: 192.168.1.176
+          claimName: 10g-tautulli-config-nfs
diff --git a/apps/tautulli/tautulli-storage.yaml b/apps/tautulli/tautulli-storage.yaml
index 4dbef67..2468c47 100644
--- a/apps/tautulli/tautulli-storage.yaml
+++ b/apps/tautulli/tautulli-storage.yaml
@@ -2,18 +2,12 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   annotations:
-  name: 10g-tautulli-config
+  name: 10g-tautulli-config-nfs
   namespace: default
 spec:
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
       storage: 10Gi
-  storageClassName: synology-iscsi-storage
-status:
-  accessModes:
-  - ReadWriteMany
-  capacity:
-    storage: 10Gi
-  phase: Bound
+  storageClassName: nfs-client
diff --git a/apps/technitium/technitium-deploymet.yaml b/apps/technitium/technitium-deploymet.yaml
index 1f1a213..3888207 100644
--- a/apps/technitium/technitium-deploymet.yaml
+++ b/apps/technitium/technitium-deploymet.yaml
@@ -44,14 +44,14 @@ spec:
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
         volumeMounts:
-        - mountPath: /config
-          name: technitium-config
+        - mountPath: /etc/dns
+          name: technitium-config-nfs
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 30
       volumes:
-      - name: technitium-config
+      - name: technitium-config-nfs
         persistentVolumeClaim:
-          claimName: technitium-config
+          claimName: technitium-config-nfs
diff --git a/apps/technitium/technitium-storage.yaml b/apps/technitium/technitium-storage.yaml
index de86a79..df8d5f1 100644
--- a/apps/technitium/technitium-storage.yaml
+++ b/apps/technitium/technitium-storage.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: technitium-config
+  name: technitium-config-nfs
   namespace: default
 spec:
-  storageClassName: synology-iscsi-storage-custom
+  storageClassName: nfs-client
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
-      storage: 10Gi
+      storage: 10Gi
\ No newline at end of file
diff --git a/apps/unifi/unifi-deployment.yaml b/apps/unifi/unifi-deployment.yaml
index a4bffe2..77321d7 100644
--- a/apps/unifi/unifi-deployment.yaml
+++ b/apps/unifi/unifi-deployment.yaml
@@ -52,14 +52,19 @@ spec:
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
         volumeMounts:
+        - mountPath: /config-nfs
+          name: unifi-config-nfs
         - mountPath: /config
-          name: unifi-config
+          name: unifi-config-nfs2
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 30
       volumes:
-      - name: unifi-config
+      - name: unifi-config-nfs
         persistentVolumeClaim:
-          claimName: unifi-config
+          claimName: unifi-config-nfs
+      - name: unifi-config-nfs2
+        persistentVolumeClaim:
+          claimName: unifi-config-nfs2
\ No newline at end of file
diff --git a/apps/unifi/unifi-storage.yaml b/apps/unifi/unifi-storage.yaml
index fc23a95..5466a42 100644
--- a/apps/unifi/unifi-storage.yaml
+++ b/apps/unifi/unifi-storage.yaml
@@ -10,3 +10,29 @@ spec:
   resources:
     requests:
       storage: 200Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: unifi-config-nfs
+  namespace: default
+spec:
+  storageClassName: nfs-client
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 5Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: unifi-config-nfs2
+  namespace: default
+spec:
+  storageClassName: nfs-client
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 5Gi
\ No newline at end of file
diff --git a/apps/wg-easy/deployment.yaml b/apps/wg-easy/deployment.yaml
index 1d36bb8..c9ea480 100644
--- a/apps/wg-easy/deployment.yaml
+++ b/apps/wg-easy/deployment.yaml
@@ -72,5 +72,4 @@ spec:
       volumes:
         - name: config
           persistentVolumeClaim:
-            claimName: wg-easy-storage-claim
-
+            claimName: wg-easy-storage-nfs-claim
diff --git a/apps/wg-easy/storage.yaml b/apps/wg-easy/storage.yaml
index 4895aeb..614cc91 100644
--- a/apps/wg-easy/storage.yaml
+++ b/apps/wg-easy/storage.yaml
@@ -1,13 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: wg-easy-storage-claim
+  name: wg-easy-storage-nfs-claim
   namespace: wg-easy
 spec:
-  storageClassName: synology-iscsi-storage-custom
+  storageClassName: nfs-client
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
       storage: 1Gi
-