diff --git a/clusters/cl01tl/applications/photoview/Chart.yaml b/clusters/cl01tl/applications/photoview/Chart.yaml
index 3c999823e..7cdf77c01 100644
--- a/clusters/cl01tl/applications/photoview/Chart.yaml
+++ b/clusters/cl01tl/applications/photoview/Chart.yaml
@@ -17,7 +17,7 @@ dependencies:
   - name: app-template
     alias: photoview
     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/photoview/templates/external-secrets.yaml b/clusters/cl01tl/applications/photoview/templates/external-secrets.yaml
index 95bd4e6ea..ef1cb1ab2 100644
--- a/clusters/cl01tl/applications/photoview/templates/external-secrets.yaml
+++ b/clusters/cl01tl/applications/photoview/templates/external-secrets.yaml
@@ -4,11 +4,8 @@ metadata:
   name: photoview-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: photoview-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/photoview/templates/http-route.yaml b/clusters/cl01tl/applications/photoview/templates/http-route.yaml
index 1858b2d13..02de1d873 100644
--- a/clusters/cl01tl/applications/photoview/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/photoview/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-photoview
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-photoview
+    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/photoview/templates/persistent-volume-claim.yaml b/clusters/cl01tl/applications/photoview/templates/persistent-volume-claim.yaml
index 191161483..ffc70f043 100644
--- a/clusters/cl01tl/applications/photoview/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/applications/photoview/templates/persistent-volume-claim.yaml
@@ -4,11 +4,8 @@ metadata:
   name: photoview-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: photoview-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: photoview-nfs-storage
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/applications/photoview/templates/persistent-volume.yaml b/clusters/cl01tl/applications/photoview/templates/persistent-volume.yaml
index bcf22883d..d192273c1 100644
--- a/clusters/cl01tl/applications/photoview/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/applications/photoview/templates/persistent-volume.yaml
@@ -4,11 +4,8 @@ metadata:
   name: photoview-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: photoview-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/photoview/values.yaml b/clusters/cl01tl/applications/photoview/values.yaml
index 27fa7f4ff..62ab29282 100644
--- a/clusters/cl01tl/applications/photoview/values.yaml
+++ b/clusters/cl01tl/applications/photoview/values.yaml
@@ -42,8 +42,6 @@ photoview:
             requests:
               cpu: 10m
               memory: 512Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main
@@ -53,14 +51,8 @@ photoview:
           targetPort: 80
           protocol: HTTP
   persistence:
-    media:
-      existingClaim: photoview-nfs-storage
-      advancedMounts:
-        main:
-          main:
-            - path: /photos
-              readOnly: true
     cache:
+      forceRename: photoview-cache
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 10Gi
@@ -73,6 +65,13 @@ photoview:
           main:
             - path: /app/cache
               readOnly: false
+    media:
+      existingClaim: photoview-nfs-storage
+      advancedMounts:
+        main:
+          main:
+            - path: /photos
+              readOnly: true
 postgres-17-cluster:
   mode: standalone
   cluster: