diff --git a/clusters/cl01tl/applications/radarr/Chart.yaml b/clusters/cl01tl/applications/radarr/Chart.yaml
index 1a4ec247c..325512c66 100644
--- a/clusters/cl01tl/applications/radarr/Chart.yaml
+++ b/clusters/cl01tl/applications/radarr/Chart.yaml
@@ -23,7 +23,7 @@ dependencies:
   - name: app-template
     alias: radarr
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 3.7.3
+    version: 4.0.1
   - name: postgres-cluster
     alias: postgres-17-cluster
     version: 5.1.0
diff --git a/clusters/cl01tl/applications/radarr/templates/external-secret.yaml b/clusters/cl01tl/applications/radarr/templates/external-secret.yaml
index b920375a7..751431f0a 100644
--- a/clusters/cl01tl/applications/radarr/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/radarr/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: radarr-config-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: radarr-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
@@ -63,11 +60,8 @@ metadata:
   name: radarr-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: radarr-postgresql-17-cluster-backup-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: database
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/applications/radarr/templates/http-route.yaml b/clusters/cl01tl/applications/radarr/templates/http-route.yaml
index 70b4224ff..c5d89cd75 100644
--- a/clusters/cl01tl/applications/radarr/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/radarr/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-radarr
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-radarr
+    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/radarr/templates/persistent-volume-claim.yaml b/clusters/cl01tl/applications/radarr/templates/persistent-volume-claim.yaml
index b44e1d038..f0fcaf7ce 100644
--- a/clusters/cl01tl/applications/radarr/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/applications/radarr/templates/persistent-volume-claim.yaml
@@ -4,11 +4,8 @@ metadata:
   name: radarr-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: radarr-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: radarr-nfs-storage
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/applications/radarr/templates/persistent-volume.yaml b/clusters/cl01tl/applications/radarr/templates/persistent-volume.yaml
index fa868d71c..7137d1637 100644
--- a/clusters/cl01tl/applications/radarr/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/applications/radarr/templates/persistent-volume.yaml
@@ -4,11 +4,8 @@ metadata:
   name: radarr-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: radarr-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/radarr/templates/prometheus-rule.yaml b/clusters/cl01tl/applications/radarr/templates/prometheus-rule.yaml
index 06019aed3..8453196a4 100644
--- a/clusters/cl01tl/applications/radarr/templates/prometheus-rule.yaml
+++ b/clusters/cl01tl/applications/radarr/templates/prometheus-rule.yaml
@@ -4,11 +4,8 @@ metadata:
   name: radarr
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: radarr
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: metrics
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   groups:
     - name: radarr
diff --git a/clusters/cl01tl/applications/radarr/templates/replication-source.yaml b/clusters/cl01tl/applications/radarr/templates/replication-source.yaml
index bc1ed258e..506a50c8a 100644
--- a/clusters/cl01tl/applications/radarr/templates/replication-source.yaml
+++ b/clusters/cl01tl/applications/radarr/templates/replication-source.yaml
@@ -4,11 +4,8 @@ metadata:
   name: radarr-config-backup-source
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: radarr-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: radarr-config
   trigger:
diff --git a/clusters/cl01tl/applications/radarr/templates/service-monitor.yaml b/clusters/cl01tl/applications/radarr/templates/service-monitor.yaml
index 8dc7203ca..f7dad2427 100644
--- a/clusters/cl01tl/applications/radarr/templates/service-monitor.yaml
+++ b/clusters/cl01tl/applications/radarr/templates/service-monitor.yaml
@@ -4,11 +4,8 @@ metadata:
   name: radarr
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: radarr
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: metrics
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   selector:
     matchLabels:
diff --git a/clusters/cl01tl/applications/radarr/values.yaml b/clusters/cl01tl/applications/radarr/values.yaml
index eb503ee8d..d9c2e2408 100644
--- a/clusters/cl01tl/applications/radarr/values.yaml
+++ b/clusters/cl01tl/applications/radarr/values.yaml
@@ -26,7 +26,7 @@ radarr:
               value: 1000
           probes:
             liveness:
-              enabled: false
+              enabled: true
               custom: true
               spec:
                 exec:
@@ -64,10 +64,8 @@ radarr:
               value: false
           resources:
             requests:
-              cpu: 100m
-              memory: 512Mi
-  serviceAccount:
-    create: true
+              cpu: 10m
+              memory: 128Mi
   service:
     main:
       controller: main
@@ -82,6 +80,7 @@ radarr:
           protocol: TCP
   persistence:
     config:
+      forceRename: radarr-config
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 20Gi