diff --git a/kubernetes/main/apps/media/komga/app/helm-release.yaml b/kubernetes/main/apps/media/komga/app/helm-release.yaml
new file mode 100644
index 0000000..9c4621d
--- /dev/null
+++ b/kubernetes/main/apps/media/komga/app/helm-release.yaml
@@ -0,0 +1,93 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: komga
+spec:
+  interval: 5m
+  chart:
+    spec:
+      chart: app-template
+      version: 3.5.1
+      sourceRef:
+        kind: HelmRepository
+        name: bjws-charts
+        namespace: flux-system
+  values:
+    controllers:
+      komga:
+        containers:
+          app:
+            image:
+              repository: gotson/komga
+              tag: 1.14.1
+            env:
+              TZ: America/New_York
+            probes:
+              liveness: &probes
+                enabled: true
+                custom: true
+                spec:
+                  httpGet:
+                    path: /
+                    port: &port 25600
+                  initialDelaySeconds: 0
+                  periodSeconds: 10
+                  timeoutSeconds: 1
+                  failureThreshold: 3
+              readiness: *probes
+              startup:
+                enabled: true
+                spec:
+                  failureThreshold: 30
+                  periodSeconds: 10
+            resources:
+              requests:
+                cpu: 2m
+                memory: 1500Mi
+              limits:
+                memory: 3200Mi
+
+#            securityContext:
+#              allowPrivilegeEscalation: false
+#              readOnlyRootFilesystem: true
+#              capabilities: { drop: ["ALL"] }
+
+#    defaultPodOptions:
+#      securityContext:
+#        runAsUser: 10000
+#        runAsGroup: 10000
+#        fsGroup: 10000
+#        fsGroupChangePolicy: OnRootMismatch
+    
+    service:
+      app:
+        controller: komga
+        ports:
+          http:
+            port: *port
+    
+    ingress:
+      app:
+        annotations:
+          cert-manager.io/cluster-issuer: letsencrypt-production
+          traefik.ingress.kubernetes.io/router.entrypoints: websecure
+        hosts:
+          - host: "comics.${SECRET_NEW_DOMAIN}"
+            paths:
+              - path: /
+                service:
+                  identifier: app
+                  port: http
+                  
+    persistence:
+      data:
+        existingClaim: komga
+        globalMounts:
+          - path: /config
+      storage:
+        type: hostPath
+        hostPath: /mnt/MainPool/Media/Media
+        globalMounts:
+          - path: /storage
+            #readOnly: true
diff --git a/kubernetes/main/apps/media/komga/kustomization.yaml b/kubernetes/main/apps/media/komga/app/kustomization.yaml
similarity index 54%
rename from kubernetes/main/apps/media/komga/kustomization.yaml
rename to kubernetes/main/apps/media/komga/app/kustomization.yaml
index ea3145d..cc46271 100644
--- a/kubernetes/main/apps/media/komga/kustomization.yaml
+++ b/kubernetes/main/apps/media/komga/app/kustomization.yaml
@@ -1,4 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+- ../../../../../common/templates/volsync
 - ./helm-release.yaml
\ No newline at end of file
diff --git a/kubernetes/main/apps/media/komga/helm-release.yaml b/kubernetes/main/apps/media/komga/helm-release.yaml
deleted file mode 100644
index b8cafb2..0000000
--- a/kubernetes/main/apps/media/komga/helm-release.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: komga
-  namespace: media
-spec:
-  interval: 5m
-  chart:
-    spec:
-      chart: app-template
-      version: 1.3.x
-      sourceRef:
-        kind: HelmRepository
-        name: bjws-charts
-        namespace: flux-system
-
-  values:
-    image:
-      repository: gotson/komga
-      tag: "1.14.1"
-
-    env:
-      TZ: America/New_York
-
-    service:
-      main:
-        ports:
-          http:
-            port: 25600
-
-    probes:
-      liveness:
-        enabled: false
-
-    ingress:
-      main:
-        enabled: true
-        annotations:
-          cert-manager.io/cluster-issuer: letsencrypt-production
-          traefik.ingress.kubernetes.io/router.entrypoints: websecure
-        hosts:
-          - host: &host "comics.${SECRET_NEW_DOMAIN}"
-            paths:
-              - path: /
-                pathType: Prefix
-        tls:
-          - hosts:
-              - *host
-
-    persistence:
-      config:
-        enabled: true
-        type: hostPath
-        hostPath: /mnt/MainPool/Kubernetes/komga
-        mountPath: /config
-      storage:
-        enabled: true
-        type: hostPath
-        hostPath: /mnt/MainPool/Media/Media
-        mountPath: /storage
-
-    resources:
-      requests:
-        cpu: 2m
-        memory: 1500Mi
-      limits:
-        memory: 3200Mi
\ No newline at end of file
diff --git a/kubernetes/main/apps/media/komga/ks.yaml b/kubernetes/main/apps/media/komga/ks.yaml
new file mode 100644
index 0000000..5907bb7
--- /dev/null
+++ b/kubernetes/main/apps/media/komga/ks.yaml
@@ -0,0 +1,31 @@
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app komga
+  namespace: flux-system
+spec:
+  timeout: 5m
+  interval: 10m
+  targetNamespace: media
+  path: ./kubernetes/main/apps/media/komga/app
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: home-cluster
+  decryption:
+    provider: sops
+    secretRef:
+      name: sops-gpg
+  dependsOn:
+    - name: openebs
+    - name: openebs-sc
+  postBuild:
+    substituteFrom:
+      - kind: ConfigMap
+        name: cluster-settings
+      - kind: Secret
+        name: cluster-secrets
+    substitute:
+      APP: *app
+      VOLSYNC_CAPACITY: 5Gi
\ No newline at end of file
diff --git a/kubernetes/main/apps/media/kustomization.yaml b/kubernetes/main/apps/media/kustomization.yaml
index bc0583c..6dae59f 100644
--- a/kubernetes/main/apps/media/kustomization.yaml
+++ b/kubernetes/main/apps/media/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 resources:
 - ./namespace.yaml
 #- ./network_policy.yaml
-- ./komga
+- ./komga/ks.yaml
 - ./kavita
 - ./jellyfin
 - ./jellyseerr