diff --git a/clusters/cl01tl/applications/yamtrack/Chart.yaml b/clusters/cl01tl/applications/yamtrack/Chart.yaml
index a79ea1d23..0d3446472 100644
--- a/clusters/cl01tl/applications/yamtrack/Chart.yaml
+++ b/clusters/cl01tl/applications/yamtrack/Chart.yaml
@@ -21,7 +21,7 @@ dependencies:
   - name: app-template
     alias: yamtrack
     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/yamtrack/templates/external-secret.yaml b/clusters/cl01tl/applications/yamtrack/templates/external-secret.yaml
index c34f27819..6a4abba01 100644
--- a/clusters/cl01tl/applications/yamtrack/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/yamtrack/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: yamtrack-config-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: yamtrack-config-secret
+    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
@@ -36,11 +33,8 @@ metadata:
   name: yamtrack-oidc-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: yamtrack-oidc-secret
+    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
@@ -61,11 +55,8 @@ metadata:
   name: yamtrack-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: yamtrack-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/yamtrack/templates/http-route.yaml b/clusters/cl01tl/applications/yamtrack/templates/http-route.yaml
index 1e27ff1d5..da96fa458 100644
--- a/clusters/cl01tl/applications/yamtrack/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/yamtrack/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-yamtrack
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-yamtrack
+    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/yamtrack/values.yaml b/clusters/cl01tl/applications/yamtrack/values.yaml
index 7a24cf249..7b0507b42 100644
--- a/clusters/cl01tl/applications/yamtrack/values.yaml
+++ b/clusters/cl01tl/applications/yamtrack/values.yaml
@@ -64,8 +64,6 @@ yamtrack:
             requests:
               cpu: 10m
               memory: 256Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main