diff --git a/clusters/cl01tl/applications/calibre-web-automated/Chart.yaml b/clusters/cl01tl/applications/calibre-web-automated/Chart.yaml
index d0172a698..05da923d0 100644
--- a/clusters/cl01tl/applications/calibre-web-automated/Chart.yaml
+++ b/clusters/cl01tl/applications/calibre-web-automated/Chart.yaml
@@ -16,6 +16,6 @@ dependencies:
   - name: app-template
     alias: calibre-web-automated
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 3.7.3
+    version: 4.0.1
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/calibre-web.png
 appVersion: V3.0.4
diff --git a/clusters/cl01tl/applications/calibre-web-automated/templates/external-secret.yaml b/clusters/cl01tl/applications/calibre-web-automated/templates/external-secret.yaml
index c3b56f03b..1c0021bc4 100644
--- a/clusters/cl01tl/applications/calibre-web-automated/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/calibre-web-automated/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: calibre-web-automated-gmail-config
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: calibre-web-automated-gmail-config
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -29,11 +26,8 @@ metadata:
   name: calibre-web-automated-config-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: calibre-web-automated-config-backup-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: backup
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/applications/calibre-web-automated/templates/http-route.yaml b/clusters/cl01tl/applications/calibre-web-automated/templates/http-route.yaml
index af63dbabf..2e25bf948 100644
--- a/clusters/cl01tl/applications/calibre-web-automated/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/calibre-web-automated/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-calibre
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-calibre
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io
@@ -36,11 +33,8 @@ metadata:
   name: http-route-calibre-downloader
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-calibre-downloader
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io
diff --git a/clusters/cl01tl/applications/calibre-web-automated/templates/persistent-volume-claim.yaml b/clusters/cl01tl/applications/calibre-web-automated/templates/persistent-volume-claim.yaml
index a237c684f..7b75285b8 100644
--- a/clusters/cl01tl/applications/calibre-web-automated/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/applications/calibre-web-automated/templates/persistent-volume-claim.yaml
@@ -4,11 +4,8 @@ metadata:
   name: calibre-web-automated-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: calibre-web-automated-nfs-storage
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: storage
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   volumeName: calibre-web-automated-nfs-storage
   storageClassName: nfs-client
@@ -25,11 +22,8 @@ metadata:
   name: calibre-web-automated-ingest-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: calibre-web-automated-ingest-nfs-storage
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: storage
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   volumeName: calibre-web-automated-ingest-nfs-storage
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/applications/calibre-web-automated/templates/persistent-volume.yaml b/clusters/cl01tl/applications/calibre-web-automated/templates/persistent-volume.yaml
index 4428541b9..c514b73a6 100644
--- a/clusters/cl01tl/applications/calibre-web-automated/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/applications/calibre-web-automated/templates/persistent-volume.yaml
@@ -4,11 +4,8 @@ metadata:
   name: calibre-web-automated-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: calibre-web-automated-nfs-storage
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: storage
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
@@ -31,11 +28,8 @@ metadata:
   name: calibre-web-automated-ingest-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: calibre-web-automated-ingest-nfs-storage
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: storage
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/applications/calibre-web-automated/templates/replication-source.yaml b/clusters/cl01tl/applications/calibre-web-automated/templates/replication-source.yaml
index 146692072..a9e89e91a 100644
--- a/clusters/cl01tl/applications/calibre-web-automated/templates/replication-source.yaml
+++ b/clusters/cl01tl/applications/calibre-web-automated/templates/replication-source.yaml
@@ -4,11 +4,8 @@ metadata:
   name: calibre-web-automated-config-backup-source
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: calibre-web-automated-config-backup-source
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: backup
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   sourcePVC: calibre-web-automated-config
   trigger:
diff --git a/clusters/cl01tl/applications/calibre-web-automated/values.yaml b/clusters/cl01tl/applications/calibre-web-automated/values.yaml
index 7f9d470b8..07d72b8f8 100644
--- a/clusters/cl01tl/applications/calibre-web-automated/values.yaml
+++ b/clusters/cl01tl/applications/calibre-web-automated/values.yaml
@@ -20,7 +20,7 @@ calibre-web-automated:
               value: 100
           resources:
             requests:
-              cpu: 100m
+              cpu: 10m
               memory: 256Mi
     downloader:
       type: deployment
@@ -61,8 +61,6 @@ calibre-web-automated:
             requests:
               cpu: 10m
               memory: 128Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main
@@ -80,6 +78,7 @@ calibre-web-automated:
           protocol: HTTP
   persistence:
     config:
+      forceRename: calibre-web-automated-config
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 5Gi