diff --git a/apps/kavita/base/email-claim-pvc.yaml b/apps/kavita/base/email-claim-pvc.yaml
deleted file mode 100644
index 0d3bc5d..0000000
--- a/apps/kavita/base/email-claim-pvc.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: kavita-email-config-pvc
-  name: kavita-email-config-pvc
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Mi
-status: {}
diff --git a/apps/kavita/base/email-service.yaml b/apps/kavita/base/email-service.yaml
deleted file mode 100644
index ed97c7f..0000000
--- a/apps/kavita/base/email-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: kavita-email
-  labels:
-    name: kavita-email
-spec:
-  ports:
-    - port: 5003
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app.kubernetes.io/name: kavita-email
-  #publishNotReadyAddresses: true
diff --git a/apps/kavita/base/email-deployment.yaml b/apps/kavita/base/email.yaml
similarity index 71%
rename from apps/kavita/base/email-deployment.yaml
rename to apps/kavita/base/email.yaml
index 4b10c48..aa3cb21 100644
--- a/apps/kavita/base/email-deployment.yaml
+++ b/apps/kavita/base/email.yaml
@@ -50,3 +50,34 @@ spec:
           persistentVolumeClaim:
             claimName: kavita-email-config-pvc
 status: {}
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: kavita-email-config-pvc
+  name: kavita-email-config-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: kavita-email
+  labels:
+    name: kavita-email
+spec:
+  ports:
+    - port: 5003
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app.kubernetes.io/name: kavita-email
+  #publishNotReadyAddresses: true
diff --git a/apps/kavita/base/kavita-comics-pvc.yaml b/apps/kavita/base/kavita-comics-pvc.yaml
deleted file mode 100644
index 872a216..0000000
--- a/apps/kavita/base/kavita-comics-pvc.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: kavita-comics-pvc
-  namespace: media
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Gi
-  volumeName: media-library-comics
diff --git a/apps/kavita/base/kavita-config-pvc.yaml b/apps/kavita/base/kavita-config-pvc.yaml
deleted file mode 100644
index 2020fb7..0000000
--- a/apps/kavita/base/kavita-config-pvc.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: kavita-config-pvc
-  name: kavita-config-pvc
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Mi
-status: {}
diff --git a/apps/kavita/base/kavita-ebooks-pvc.yaml b/apps/kavita/base/kavita-ebooks-pvc.yaml
deleted file mode 100644
index 624de08..0000000
--- a/apps/kavita/base/kavita-ebooks-pvc.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: kavita-ebooks-pvc
-  namespace: media
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Gi
-  volumeName: media-library-ebooks
diff --git a/apps/kavita/base/kavita-ingress.yaml b/apps/kavita/base/kavita-ingress.yaml
deleted file mode 100644
index ad24bd2..0000000
--- a/apps/kavita/base/kavita-ingress.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-issuer
-    gethomepage.dev/enabled: "true"
-    gethomepage.dev/name: "Books"
-    gethomepage.dev/description: "Ebooks and graphic novels by Kavita"
-    gethomepage.dev/group: "Media"
-    gethomepage.dev/icon: "kavita.png"
-  name: kavita
-  labels:
-    name: kavita
-spec:
-  rules:
-    - host: library.nc.landry.land
-      http:
-        paths:
-          - backend:
-              service:
-                name: kavita
-                port:
-                  number: 5000
-            path: /
-            pathType: Prefix
-
-  tls:
-    - hosts:
-        - library.nc.landry.land
-      secretName: kavita-tls
diff --git a/apps/kavita/base/kavita-service.yaml b/apps/kavita/base/kavita-service.yaml
deleted file mode 100644
index 7984487..0000000
--- a/apps/kavita/base/kavita-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: kavita
-  labels:
-    name: kavita
-spec:
-  ports:
-    - port: 5000
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app.kubernetes.io/name: kavita
-  #publishNotReadyAddresses: true
diff --git a/apps/kavita/base/kavita-deployment.yaml b/apps/kavita/base/kavita.yaml
similarity index 69%
rename from apps/kavita/base/kavita-deployment.yaml
rename to apps/kavita/base/kavita.yaml
index 6d01f54..31dbe8c 100644
--- a/apps/kavita/base/kavita-deployment.yaml
+++ b/apps/kavita/base/kavita.yaml
@@ -93,3 +93,65 @@ spec:
           persistentVolumeClaim:
             claimName: kavita-comics-pvc
 status: {}
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: kavita-config-pvc
+  name: kavita-config-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: kavita
+  labels:
+    name: kavita
+spec:
+  ports:
+    - port: 5000
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app.kubernetes.io/name: kavita
+  #publishNotReadyAddresses: true
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-issuer
+    gethomepage.dev/enabled: "true"
+    gethomepage.dev/name: "Books"
+    gethomepage.dev/description: "Ebooks and graphic novels by Kavita"
+    gethomepage.dev/group: "Media"
+    gethomepage.dev/icon: "kavita.png"
+  name: kavita
+  labels:
+    name: kavita
+spec:
+  rules:
+    - host: library.nc.landry.land
+      http:
+        paths:
+          - backend:
+              service:
+                name: kavita
+                port:
+                  number: 5000
+            path: /
+            pathType: Prefix
+
+  tls:
+    - hosts:
+        - library.nc.landry.land
+      secretName: kavita-tls
diff --git a/apps/kavita/base/kustomization.yaml b/apps/kavita/base/kustomization.yaml
index 9e35588..a9d17f5 100644
--- a/apps/kavita/base/kustomization.yaml
+++ b/apps/kavita/base/kustomization.yaml
@@ -1,17 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - email-claim-pvc.yaml
-  - email-deployment.yaml
-  - email-service.yaml
-  - kavita-comics-pv.yaml
-  - kavita-comics-pvc.yaml
-  - kavita-config-pvc.yaml
-  - kavita-deployment.yaml
-  - kavita-ebooks-pv.yaml
-  - kavita-ebooks-pvc.yaml
-  - kavita-ingress.yaml
-  - kavita-service.yaml
+  - ./email.yaml
+  - ./kavita.yaml
+  - ./pv-comics.yaml
+  - ./pv-ebooks.yaml
   - ./pv-techbooks.yaml
   - ./pv-ttrpgbooks.yaml
 
diff --git a/apps/kavita/base/kavita-comics-pv.yaml b/apps/kavita/base/pv-comics.yaml
similarity index 63%
rename from apps/kavita/base/kavita-comics-pv.yaml
rename to apps/kavita/base/pv-comics.yaml
index b4ce4ad..6979cba 100644
--- a/apps/kavita/base/kavita-comics-pv.yaml
+++ b/apps/kavita/base/pv-comics.yaml
@@ -1,4 +1,17 @@
 apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: kavita-comics-pvc
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Gi
+  volumeName: media-library-comics
+---
+apiVersion: v1
 kind: PersistentVolume
 metadata:
   annotations:
diff --git a/apps/kavita/base/kavita-ebooks-pv.yaml b/apps/kavita/base/pv-ebooks.yaml
similarity index 63%
rename from apps/kavita/base/kavita-ebooks-pv.yaml
rename to apps/kavita/base/pv-ebooks.yaml
index 79de27e..b95b4b8 100644
--- a/apps/kavita/base/kavita-ebooks-pv.yaml
+++ b/apps/kavita/base/pv-ebooks.yaml
@@ -1,4 +1,17 @@
 apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: kavita-ebooks-pvc
+  namespace: media
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Gi
+  volumeName: media-library-ebooks
+---
+apiVersion: v1
 kind: PersistentVolume
 metadata:
   annotations:
diff --git a/projects/work.yaml b/projects/work.yaml
index bc3c169..8417b60 100644
--- a/projects/work.yaml
+++ b/projects/work.yaml
@@ -14,7 +14,7 @@ spec:
       kind: "*"
   description: playground for work projects
   destinations:
-    - namespace: "*" # Change back to 'work-*' after I finish testing the rabbitmq operators
+    - namespace: "work-*" # Change back to 'work-*' after I finish testing the rabbitmq operators
       server: "*"
   namespaceResourceWhitelist:
     - group: "*"