diff --git a/deployments/media/bazarr-pvc.yaml b/deployments/media/bazarr-pvc.yaml
new file mode 100644
index 0000000..af6462a
--- /dev/null
+++ b/deployments/media/bazarr-pvc.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: bazarr-config
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 2Gi
+  storageClassName: longhorn
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: bazarr-podcasts
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 2Gi
+  storageClassName: longhorn
diff --git a/deployments/media/bazarr/deployment.yaml b/deployments/media/bazarr/deployment.yaml
deleted file mode 100644
index 9290b20..0000000
--- a/deployments/media/bazarr/deployment.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: bazarr
-  namespace: media
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: bazarr
-  template:
-    metadata:
-      labels:
-        app: bazarr
-    spec:
-      containers:
-        - name: bazarr
-          image: lscr.io/linuxserver/bazarr:latest
-          ports:
-            - containerPort: 6767
-          env:
-            - name: PUID
-              value: "1000"
-            - name: PGID
-              value: "1000"
-            - name: TZ
-              value: "America/New_York"
-          volumeMounts:
-            - name: config
-              mountPath: /config
-            - name: media
-              mountPath: /media
-            - name: podcasts
-              mountPath: /podcasts
-      volumes:
-        - name: config
-          persistentVolumeClaim:
-            claimName: bazarr-config
-        - name: media
-          persistentVolumeClaim:
-            claimName: media-data
-        - name: podcasts
-          persistentVolumeClaim:
-            claimName: bazarr-podcasts
\ No newline at end of file
diff --git a/deployments/media/emby-pvc.yaml b/deployments/media/emby-pvc.yaml
new file mode 100644
index 0000000..a6f9ce1
--- /dev/null
+++ b/deployments/media/emby-pvc.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: emby-config
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi
+  storageClassName: longhorn
diff --git a/deployments/media/emby/deployment.yaml b/deployments/media/emby/deployment.yaml
deleted file mode 100644
index 5172842..0000000
--- a/deployments/media/emby/deployment.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: emby
-  namespace: media
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: emby
-  template:
-    metadata:
-      labels:
-        app: emby
-    spec:
-      containers:
-        - name: emby
-          image: lscr.io/linuxserver/emby:latest
-          ports:
-            - containerPort: 8096
-            - containerPort: 8920
-          env:
-            - name: PUID
-              value: "1000"
-            - name: PGID
-              value: "1000"
-            - name: TZ
-              value: "America/New_York"
-          volumeMounts:
-            - name: config
-              mountPath: /config
-            - name: media
-              mountPath: /media
-      volumes:
-        - name: config
-          persistentVolumeClaim:
-            claimName: emby-config
-        - name: media
-          persistentVolumeClaim:
-            claimName: media-data
\ No newline at end of file
diff --git a/deployments/media/lidarr-pvc.yaml b/deployments/media/lidarr-pvc.yaml
new file mode 100644
index 0000000..8aaa5e9
--- /dev/null
+++ b/deployments/media/lidarr-pvc.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: lidarr-config
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+  storageClassName: longhorn
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: lidarr-downloads
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 50Gi
+  storageClassName: longhorn
diff --git a/deployments/media/lidarr/deployment.yaml b/deployments/media/lidarr/deployment.yaml
deleted file mode 100644
index af5c462..0000000
--- a/deployments/media/lidarr/deployment.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: lidarr
-  namespace: media
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: lidarr
-  template:
-    metadata:
-      labels:
-        app: lidarr
-    spec:
-      containers:
-        - name: lidarr
-          image: lscr.io/linuxserver/lidarr:latest
-          ports:
-            - containerPort: 8686
-          env:
-            - name: PUID
-              value: "1000"
-            - name: PGID
-              value: "1000"
-            - name: TZ
-              value: "America/New_York"
-          volumeMounts:
-            - name: config
-              mountPath: /config
-            - name: media
-              mountPath: /media
-            - name: downloads
-              mountPath: /downloads
-      volumes:
-        - name: config
-          persistentVolumeClaim:
-            claimName: lidarr-config
-        - name: media
-          persistentVolumeClaim:
-            claimName: media-data
-        - name: downloads
-          persistentVolumeClaim:
-            claimName: lidarr-downloads
\ No newline at end of file
diff --git a/deployments/media/prowlarr-pvc.yaml b/deployments/media/prowlarr-pvc.yaml
new file mode 100644
index 0000000..ade5982
--- /dev/null
+++ b/deployments/media/prowlarr-pvc.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: prowlarr-config
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 2Gi
+  storageClassName: longhorn
diff --git a/deployments/media/prowlarr/deployment.yaml b/deployments/media/prowlarr/deployment.yaml
deleted file mode 100644
index 5b3207c..0000000
--- a/deployments/media/prowlarr/deployment.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: prowlarr
-  namespace: media
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: prowlarr
-  template:
-    metadata:
-      labels:
-        app: prowlarr
-    spec:
-      containers:
-        - name: prowlarr
-          image: lscr.io/linuxserver/prowlarr:latest
-          ports:
-            - containerPort: 9696
-          env:
-            - name: PUID
-              value: "1000"
-            - name: PGID
-              value: "1000"
-            - name: TZ
-              value: "America/New_York"
-          volumeMounts:
-            - name: config
-              mountPath: /config
-      volumes:
-        - name: config
-          persistentVolumeClaim:
-            claimName: prowlarr-config
\ No newline at end of file
diff --git a/deployments/media/radarr-pvc.yaml b/deployments/media/radarr-pvc.yaml
new file mode 100644
index 0000000..d2d690a
--- /dev/null
+++ b/deployments/media/radarr-pvc.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: radarr-config
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+  storageClassName: longhorn
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: radarr-downloads
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 50Gi
+  storageClassName: longhorn
diff --git a/deployments/media/radarr/deployment.yaml b/deployments/media/radarr/deployment.yaml
deleted file mode 100644
index 1478c29..0000000
--- a/deployments/media/radarr/deployment.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: radarr
-  namespace: media
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: radarr
-  template:
-    metadata:
-      labels:
-        app: radarr
-    spec:
-      containers:
-        - name: radarr
-          image: lscr.io/linuxserver/radarr:latest
-          ports:
-            - containerPort: 7878
-          env:
-            - name: PUID
-              value: "1000"
-            - name: PGID
-              value: "1000"
-            - name: TZ
-              value: "America/New_York"
-          volumeMounts:
-            - name: config
-              mountPath: /config
-            - name: media
-              mountPath: /media
-            - name: downloads
-              mountPath: /downloads
-      volumes:
-        - name: config
-          persistentVolumeClaim:
-            claimName: radarr-config
-        - name: media
-          persistentVolumeClaim:
-            claimName: media-data
-        - name: downloads
-          persistentVolumeClaim:
-            claimName: radarr-downloads
\ No newline at end of file
diff --git a/deployments/media/readarr-pvc.yaml b/deployments/media/readarr-pvc.yaml
new file mode 100644
index 0000000..419e642
--- /dev/null
+++ b/deployments/media/readarr-pvc.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: readarr-config
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 2Gi
+  storageClassName: longhorn
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: readarr-books
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 2Gi
+  storageClassName: longhorn
diff --git a/deployments/media/readarr/deployment.yaml b/deployments/media/readarr/deployment.yaml
deleted file mode 100644
index c615acc..0000000
--- a/deployments/media/readarr/deployment.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: readarr
-  namespace: media
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: readarr
-  template:
-    metadata:
-      labels:
-        app: readarr
-    spec:
-      containers:
-        - name: readarr
-          image: lscr.io/linuxserver/readarr:develop
-          ports:
-            - containerPort: 8787
-          env:
-            - name: PUID
-              value: "1000"
-            - name: PGID
-              value: "1000"
-            - name: TZ
-              value: "America/New_York"
-          volumeMounts:
-            - name: config
-              mountPath: /config
-            - name: books
-              mountPath: /books
-            - name: downloads
-              mountPath: /downloads
-      volumes:
-        - name: config
-          persistentVolumeClaim:
-            claimName: readarr-config
-        - name: books
-          persistentVolumeClaim:
-            claimName: readarr-books
-        - name: downloads
-          persistentVolumeClaim:
-            claimName: readarr-downloads
\ No newline at end of file
diff --git a/deployments/media/sonarr-pvc.yaml b/deployments/media/sonarr-pvc.yaml
new file mode 100644
index 0000000..f133c54
--- /dev/null
+++ b/deployments/media/sonarr-pvc.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: sonarr-config
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+  storageClassName: longhorn
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: sonarr-downloads
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 50Gi
+  storageClassName: longhorn
diff --git a/deployments/media/sonarr/deployment.yaml b/deployments/media/sonarr/deployment.yaml
deleted file mode 100644
index 838bc49..0000000
--- a/deployments/media/sonarr/deployment.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: sonarr
-  namespace: media
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: sonarr
-  template:
-    metadata:
-      labels:
-        app: sonarr
-    spec:
-      containers:
-        - name: sonarr
-          image: lscr.io/linuxserver/sonarr:develop
-          ports:
-            - containerPort: 8989
-          env:
-            - name: PUID
-              value: "1000"
-            - name: PGID
-              value: "1000"
-            - name: TZ
-              value: "America/New_York"
-          volumeMounts:
-            - name: config
-              mountPath: /config
-            - name: media
-              mountPath: /media
-            - name: downloads
-              mountPath: /downloads
-      volumes:
-        - name: config
-          persistentVolumeClaim:
-            claimName: sonarr-config
-        - name: media
-          persistentVolumeClaim:
-            claimName: media-data
-        - name: downloads
-          persistentVolumeClaim:
-            claimName: sonarr-downloads
\ No newline at end of file