diff --git a/kubernetes/app/immich/pv-db.yaml b/kubernetes/app/immich/pv-db.yaml
new file mode 100644
index 0000000..3eb3611
--- /dev/null
+++ b/kubernetes/app/immich/pv-db.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: immich-db
+spec:
+  capacity:
+    storage: 10Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/immich-db
diff --git a/kubernetes/app/immich/pvc.yaml b/kubernetes/app/immich/pvc.yaml
index 5b02197..4c9fc9b 100644
--- a/kubernetes/app/immich/pvc.yaml
+++ b/kubernetes/app/immich/pvc.yaml
@@ -20,7 +20,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: immich-db
   resources:
     requests:
       storage: 10Gi
diff --git a/kubernetes/app/jellyfin/pv-config.yaml b/kubernetes/app/jellyfin/pv-config.yaml
new file mode 100644
index 0000000..2cf1fa7
--- /dev/null
+++ b/kubernetes/app/jellyfin/pv-config.yaml
@@ -0,0 +1,35 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: jellyfin-config
+spec:
+  capacity:
+    storage: 30Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/jellyfin-config
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: jellyfin-cache
+spec:
+  capacity:
+    storage: 20Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/jellyfin-cache
diff --git a/kubernetes/app/jellyfin/pvc.yaml b/kubernetes/app/jellyfin/pvc.yaml
index a97cb1a..1952989 100644
--- a/kubernetes/app/jellyfin/pvc.yaml
+++ b/kubernetes/app/jellyfin/pvc.yaml
@@ -8,7 +8,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: jellyfin-config
   resources:
     requests:
       storage: 30Gi
@@ -22,7 +23,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: jellyfin-cache
   resources:
     requests:
       storage: 20Gi
diff --git a/kubernetes/app/lubelogger/pv.yaml b/kubernetes/app/lubelogger/pv.yaml
new file mode 100644
index 0000000..b01cff4
--- /dev/null
+++ b/kubernetes/app/lubelogger/pv.yaml
@@ -0,0 +1,35 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: lubelogger-data
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/lubelogger-data
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: lubelogger-keys
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/lubelogger-keys
diff --git a/kubernetes/app/lubelogger/volumeclaim.yaml b/kubernetes/app/lubelogger/pvc.yaml
similarity index 78%
rename from kubernetes/app/lubelogger/volumeclaim.yaml
rename to kubernetes/app/lubelogger/pvc.yaml
index 6619e86..a15c01f 100644
--- a/kubernetes/app/lubelogger/volumeclaim.yaml
+++ b/kubernetes/app/lubelogger/pvc.yaml
@@ -7,7 +7,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: lubelogger-data
   resources:
     requests:
       storage: 1Gi
@@ -20,7 +21,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: lubelogger-keys
   resources:
     requests:
       storage: 1Gi
diff --git a/kubernetes/app/media/pv-config.yaml b/kubernetes/app/media/pv-config.yaml
new file mode 100644
index 0000000..a54ba3b
--- /dev/null
+++ b/kubernetes/app/media/pv-config.yaml
@@ -0,0 +1,107 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: qbittorrent-config
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/qbittorrent-config
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: prowlarr-config
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/prowlarr-config
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: radarr-config
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/radarr-config
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: radarr-db
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/radarr-db
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: sonarr-config
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/sonarr-config
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: sonarr-db
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/sonarr-db
diff --git a/kubernetes/app/media/volumeclaim.yaml b/kubernetes/app/media/pvc.yaml
similarity index 81%
rename from kubernetes/app/media/volumeclaim.yaml
rename to kubernetes/app/media/pvc.yaml
index 7493bb5..0181065 100644
--- a/kubernetes/app/media/volumeclaim.yaml
+++ b/kubernetes/app/media/pvc.yaml
@@ -20,7 +20,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: qbittorrent-config
   resources:
     requests:
       storage: 1Gi
@@ -33,7 +34,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: prowlarr-config
   resources:
     requests:
       storage: 1Gi
@@ -46,7 +48,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: sonarr-config
   resources:
     requests:
       storage: 5Gi
@@ -59,7 +62,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: radarr-config
   resources:
     requests:
       storage: 5Gi
@@ -72,7 +76,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: sonarr-db
   resources:
     requests:
       storage: 5Gi
@@ -85,7 +90,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: radarr-db
   resources:
     requests:
       storage: 5Gi
diff --git a/kubernetes/app/pihole/pv.yaml b/kubernetes/app/pihole/pv.yaml
new file mode 100644
index 0000000..530f5f2
--- /dev/null
+++ b/kubernetes/app/pihole/pv.yaml
@@ -0,0 +1,35 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pihole-config
+spec:
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/pihole-config
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pihole-dnsmasq
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/pihole-dnsmasq
diff --git a/kubernetes/app/pihole/pvc.yaml b/kubernetes/app/pihole/pvc.yaml
index 45fcf72..bb75376 100644
--- a/kubernetes/app/pihole/pvc.yaml
+++ b/kubernetes/app/pihole/pvc.yaml
@@ -6,7 +6,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: pihole-config
   resources:
     requests:
       storage: 2Gi
@@ -19,7 +20,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: pihole-dnsmasq
   resources:
     requests:
       storage: 1Gi
diff --git a/kubernetes/app/podsync/pv.yaml b/kubernetes/app/podsync/pv.yaml
index 345ba3e..1819042 100644
--- a/kubernetes/app/podsync/pv.yaml
+++ b/kubernetes/app/podsync/pv.yaml
@@ -15,3 +15,21 @@ spec:
   nfs:
     server: synology.storage.lviv
     path: ${PODSYNC_NFS_PATH}
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: podsync-database
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/podsync-database
diff --git a/kubernetes/app/podsync/pvc.yaml b/kubernetes/app/podsync/pvc.yaml
index deb999c..f9ebf2e 100644
--- a/kubernetes/app/podsync/pvc.yaml
+++ b/kubernetes/app/podsync/pvc.yaml
@@ -20,7 +20,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: podsync-database
   resources:
     requests:
       storage: 1Gi
diff --git a/kubernetes/infrastructure/controllers/authelia/pv.yaml b/kubernetes/infrastructure/controllers/authelia/pv.yaml
new file mode 100644
index 0000000..6ce37f0
--- /dev/null
+++ b/kubernetes/infrastructure/controllers/authelia/pv.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: authelia-data
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ""
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nointr
+  nfs:
+    server: synology.storage.lviv
+    path: /volume3/k8s-storage/authelia-data
diff --git a/kubernetes/infrastructure/controllers/authelia/pvc.yaml b/kubernetes/infrastructure/controllers/authelia/pvc.yaml
index b230e13..ba11a55 100644
--- a/kubernetes/infrastructure/controllers/authelia/pvc.yaml
+++ b/kubernetes/infrastructure/controllers/authelia/pvc.yaml
@@ -7,7 +7,8 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: nfs-synology-ssd
+  storageClassName: ""
+  volumeName: authelia-data
   resources:
     requests:
       storage: 1Gi