diff --git a/apps/base/jellyfin/kustomization.yaml b/apps/base/jellyfin/kustomization.yaml
deleted file mode 100644
index 35c0a6332f3c686bbf410768eb452125eb4600c5..0000000000000000000000000000000000000000
--- a/apps/base/jellyfin/kustomization.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: jellyfin
-resources:
-- namespace.yaml
-- pvc.yaml
-- deployment.yaml
-- service.yaml
-- ../../../shared/networkpolicies/allow-from-ingress.yaml
-patchesStrategicMerge:
-  - networkpolicy.yaml
diff --git a/apps/base/jellyfin/deployment.yaml b/apps/k8s01/jellyfin/deployment.yaml
similarity index 100%
rename from apps/base/jellyfin/deployment.yaml
rename to apps/k8s01/jellyfin/deployment.yaml
diff --git a/apps/k8s01/jellyfin/kustomization.yaml b/apps/k8s01/jellyfin/kustomization.yaml
index 1988a3221a6dba95f797c6ecb2d39076ee301e68..d43f3676db49b8715683c363118b17674a82f959 100644
--- a/apps/k8s01/jellyfin/kustomization.yaml
+++ b/apps/k8s01/jellyfin/kustomization.yaml
@@ -2,7 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: jellyfin
 resources:
-  - ../../base/jellyfin
+  - namespace.yaml
+  - pv.yaml
+  - pvc.yaml
+  - deployment.yaml
+  - service.yaml
   - certificate.yaml
   - ingress.yaml
+  - ../../../shared/networkpolicies/allow-from-ingress.yaml
   - ../../../shared/resourcequotas/default.yaml
+patchesStrategicMerge:
+  - networkpolicy.yaml
\ No newline at end of file
diff --git a/apps/base/jellyfin/namespace.yaml b/apps/k8s01/jellyfin/namespace.yaml
similarity index 100%
rename from apps/base/jellyfin/namespace.yaml
rename to apps/k8s01/jellyfin/namespace.yaml
diff --git a/apps/base/jellyfin/networkpolicy.yaml b/apps/k8s01/jellyfin/networkpolicy.yaml
similarity index 100%
rename from apps/base/jellyfin/networkpolicy.yaml
rename to apps/k8s01/jellyfin/networkpolicy.yaml
diff --git a/apps/k8s01/jellyfin/pv.yaml b/apps/k8s01/jellyfin/pv.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d2945a531c6775c6832461e9f8aa5bf3c65a1b23
--- /dev/null
+++ b/apps/k8s01/jellyfin/pv.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: jellyfin-movies
+spec:
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: ""
+  capacity:
+    storage: 2Ti
+  accessModes:
+    - ReadWriteMany
+  volumeMode: Filesystem
+  nfs:
+    server: fs03.storage.si-infra.de
+    path: "/mnt/NAS/shares/movies"
+  mountOptions:
+    - hard
+    - noexec
+    - nfsvers=4
diff --git a/apps/base/jellyfin/pvc.yaml b/apps/k8s01/jellyfin/pvc.yaml
similarity index 62%
rename from apps/base/jellyfin/pvc.yaml
rename to apps/k8s01/jellyfin/pvc.yaml
index 0551cf8a6e98155c65b4ada01c0b587f6ed7fe0e..cc88ddaa87f9331b5b6e32278e321ed2d2f06d53 100644
--- a/apps/base/jellyfin/pvc.yaml
+++ b/apps/k8s01/jellyfin/pvc.yaml
@@ -1,6 +1,22 @@
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
+metadata:
+  name: jellyfin-movies
+  labels:
+    app.kubernetes.io/name: jellyfin
+    app.kubernetes.io/component: jellyfin
+spec:
+  storageClassName: ""
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Ti
+  volumeName: jellyfin-movies
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
 metadata:
   name: jellyfin-config
   labels:
diff --git a/apps/base/jellyfin/service.yaml b/apps/k8s01/jellyfin/service.yaml
similarity index 100%
rename from apps/base/jellyfin/service.yaml
rename to apps/k8s01/jellyfin/service.yaml