Update Helm release gitea to v12

2025-05-17 01:31:16 +00:00
58 changed files with 319 additions and 99 deletions
--- a/clusters/cl01tl/applications/sonarr-4k/Chart.yaml
+++ b/clusters/cl01tl/applications/sonarr-4k/Chart.yaml
@@ -24,7 +24,7 @@ dependencies:
  - name: app-template
    alias: sonarr-4k
    repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.0.1
+    version: 3.7.3
  - name: postgres-cluster
    alias: postgres-17-cluster
    version: 5.1.0
--- a/clusters/cl01tl/applications/sonarr-4k/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/sonarr-4k/templates/external-secret.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-4k-config-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-4k-config-backup-secret
    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
@@ -60,8 +63,11 @@ metadata:
  name: sonarr-4k-postgresql-17-cluster-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-4k-postgresql-17-cluster-backup-secret
    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
--- a/clusters/cl01tl/applications/sonarr-4k/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/sonarr-4k/templates/http-route.yaml
@@ -4,8 +4,11 @@ metadata:
  name: http-route-sonarr-4k
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: http-route-sonarr-4k
    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
--- a/clusters/cl01tl/applications/sonarr-4k/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/applications/sonarr-4k/templates/persistent-volume-claim.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-4k-nfs-storage
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-4k-nfs-storage
    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: sonarr-4k-nfs-storage
  storageClassName: nfs-client
--- a/clusters/cl01tl/applications/sonarr-4k/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/applications/sonarr-4k/templates/persistent-volume.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-4k-nfs-storage
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-4k-nfs-storage
    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
--- a/clusters/cl01tl/applications/sonarr-4k/templates/prometheus-rule.yaml
+++ b/clusters/cl01tl/applications/sonarr-4k/templates/prometheus-rule.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-4k
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-4k
    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: sonarr-4k
--- a/clusters/cl01tl/applications/sonarr-4k/templates/replication-source.yaml
+++ b/clusters/cl01tl/applications/sonarr-4k/templates/replication-source.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-4k-config-backup-source
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-4k-config-backup-source
    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: sonarr-4k-config
  trigger:
--- a/clusters/cl01tl/applications/sonarr-4k/templates/service-monitor.yaml
+++ b/clusters/cl01tl/applications/sonarr-4k/templates/service-monitor.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-4k
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-4k
    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:
--- a/clusters/cl01tl/applications/sonarr-4k/values.yaml
+++ b/clusters/cl01tl/applications/sonarr-4k/values.yaml
@@ -22,6 +22,23 @@ sonarr-4k:
              value: 1000
            - name: PGID
              value: 1000
+          probes:
+            liveness:
+              enabled: false
+              custom: true
+              spec:
+                exec:
+                  command:
+                  - /usr/bin/env
+                  - bash
+                  - -c
+                  - curl --fail localhost:8989/api/v1/system/status?apiKey=`IFS=\> && while
+                    read -d \< E C; do if [[ $E = "ApiKey" ]]; then echo $C; fi; done < /config/config.xml`
+                failureThreshold: 5
+                initialDelaySeconds: 60
+                periodSeconds: 10
+                successThreshold: 1
+                timeoutSeconds: 10
          resources:
            requests:
              cpu: 10m
@@ -45,8 +62,10 @@ sonarr-4k:
              value: false
          resources:
            requests:
-              cpu: 10m
+              cpu: 100m
              memory: 256Mi
+  serviceAccount:
+    create: true
  service:
    main:
      controller: main
@@ -61,7 +80,6 @@ sonarr-4k:
          protocol: TCP
  persistence:
    config:
-      forceRename: sonarr-4k-config
      storageClass: ceph-block
      accessMode: ReadWriteOnce
      size: 20Gi
--- a/clusters/cl01tl/applications/sonarr-anime/Chart.yaml
+++ b/clusters/cl01tl/applications/sonarr-anime/Chart.yaml
@@ -23,7 +23,7 @@ dependencies:
  - name: app-template
    alias: sonarr-anime
    repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.0.1
+    version: 3.7.3
  - name: postgres-cluster
    alias: postgres-17-cluster
    version: 5.1.0
--- a/clusters/cl01tl/applications/sonarr-anime/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/sonarr-anime/templates/external-secret.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-anime-config-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-anime-config-backup-secret
    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
@@ -60,8 +63,11 @@ metadata:
  name: sonarr-anime-postgresql-17-cluster-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-anime-postgresql-17-cluster-backup-secret
    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
--- a/clusters/cl01tl/applications/sonarr-anime/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/sonarr-anime/templates/http-route.yaml
@@ -4,8 +4,11 @@ metadata:
  name: http-route-sonarr-anime
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: http-route-sonarr-anime
    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
--- a/clusters/cl01tl/applications/sonarr-anime/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/applications/sonarr-anime/templates/persistent-volume-claim.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-anime-nfs-storage
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-anime-nfs-storage
    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: sonarr-anime-nfs-storage
  storageClassName: nfs-client
--- a/clusters/cl01tl/applications/sonarr-anime/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/applications/sonarr-anime/templates/persistent-volume.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-anime-nfs-storage
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-anime-nfs-storage
    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
--- a/clusters/cl01tl/applications/sonarr-anime/templates/prometheus-rule.yaml
+++ b/clusters/cl01tl/applications/sonarr-anime/templates/prometheus-rule.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-anime
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-anime
    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: sonarr-anime
--- a/clusters/cl01tl/applications/sonarr-anime/templates/replication-source.yaml
+++ b/clusters/cl01tl/applications/sonarr-anime/templates/replication-source.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-anime-config-backup-source
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-anime-config-backup-source
    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: sonarr-anime-config
  trigger:
--- a/clusters/cl01tl/applications/sonarr-anime/templates/service-monitor.yaml
+++ b/clusters/cl01tl/applications/sonarr-anime/templates/service-monitor.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-anime
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-anime
    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:
--- a/clusters/cl01tl/applications/sonarr-anime/values.yaml
+++ b/clusters/cl01tl/applications/sonarr-anime/values.yaml
@@ -22,6 +22,23 @@ sonarr-anime:
              value: 1000
            - name: PGID
              value: 1000
+          probes:
+            liveness:
+              enabled: false
+              custom: true
+              spec:
+                exec:
+                  command:
+                  - /usr/bin/env
+                  - bash
+                  - -c
+                  - curl --fail localhost:8989/api/v1/system/status?apiKey=`IFS=\> && while
+                    read -d \< E C; do if [[ $E = "ApiKey" ]]; then echo $C; fi; done < /config/config.xml`
+                failureThreshold: 5
+                initialDelaySeconds: 60
+                periodSeconds: 10
+                successThreshold: 1
+                timeoutSeconds: 10
          resources:
            requests:
              cpu: 10m
@@ -45,8 +62,10 @@ sonarr-anime:
              value: false
          resources:
            requests:
-              cpu: 10m
+              cpu: 100m
              memory: 256Mi
+  serviceAccount:
+    create: true
  service:
    main:
      controller: main
@@ -61,7 +80,6 @@ sonarr-anime:
          protocol: TCP
  persistence:
    config:
-      forceRename: sonarr-anime-config
      storageClass: ceph-block
      accessMode: ReadWriteOnce
      size: 20Gi
--- a/clusters/cl01tl/applications/sonarr/Chart.yaml
+++ b/clusters/cl01tl/applications/sonarr/Chart.yaml
@@ -23,7 +23,7 @@ dependencies:
  - name: app-template
    alias: sonarr
    repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.0.1
+    version: 3.7.3
  - name: postgres-cluster
    alias: postgres-17-cluster
    version: 5.1.0
--- a/clusters/cl01tl/applications/sonarr/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/sonarr/templates/external-secret.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-config-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-config-backup-secret
    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
@@ -60,8 +63,11 @@ metadata:
  name: sonarr-postgresql-17-cluster-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-postgresql-17-cluster-backup-secret
    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
--- a/clusters/cl01tl/applications/sonarr/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/sonarr/templates/http-route.yaml
@@ -4,8 +4,11 @@ metadata:
  name: http-route-sonarr
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: http-route-sonarr
    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
--- a/clusters/cl01tl/applications/sonarr/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/applications/sonarr/templates/persistent-volume-claim.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-nfs-storage
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-nfs-storage
    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: sonarr-nfs-storage
  storageClassName: nfs-client
--- a/clusters/cl01tl/applications/sonarr/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/applications/sonarr/templates/persistent-volume.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-nfs-storage
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-nfs-storage
    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
--- a/clusters/cl01tl/applications/sonarr/templates/prometheus-rule.yaml
+++ b/clusters/cl01tl/applications/sonarr/templates/prometheus-rule.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr
    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: sonarr
--- a/clusters/cl01tl/applications/sonarr/templates/replication-source.yaml
+++ b/clusters/cl01tl/applications/sonarr/templates/replication-source.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr-config-backup-source
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr-config-backup-source
    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: sonarr-config
  trigger:
--- a/clusters/cl01tl/applications/sonarr/templates/service-monitor.yaml
+++ b/clusters/cl01tl/applications/sonarr/templates/service-monitor.yaml
@@ -4,8 +4,11 @@ metadata:
  name: sonarr
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: sonarr
    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:
--- a/clusters/cl01tl/applications/sonarr/values.yaml
+++ b/clusters/cl01tl/applications/sonarr/values.yaml
@@ -22,6 +22,23 @@ sonarr:
              value: 1000
            - name: PGID
              value: 1000
+          probes:
+            liveness:
+              enabled: false
+              custom: true
+              spec:
+                exec:
+                  command:
+                  - /usr/bin/env
+                  - bash
+                  - -c
+                  - curl --fail localhost:8989/api/v1/system/status?apiKey=`IFS=\> && while
+                    read -d \< E C; do if [[ $E = "ApiKey" ]]; then echo $C; fi; done < /config/config.xml`
+                failureThreshold: 5
+                initialDelaySeconds: 60
+                periodSeconds: 10
+                successThreshold: 1
+                timeoutSeconds: 10
          resources:
            requests:
              cpu: 100m
@@ -45,8 +62,10 @@ sonarr:
              value: false
          resources:
            requests:
-              cpu: 10m
+              cpu: 100m
              memory: 256Mi
+  serviceAccount:
+    create: true
  service:
    main:
      controller: main
@@ -61,7 +80,6 @@ sonarr:
          protocol: TCP
  persistence:
    config:
-      forceRename: sonarr-config
      storageClass: ceph-block
      accessMode: ReadWriteOnce
      size: 20Gi
--- a/clusters/cl01tl/applications/tautulli/Chart.yaml
+++ b/clusters/cl01tl/applications/tautulli/Chart.yaml
@@ -16,6 +16,6 @@ dependencies:
  - name: app-template
    alias: tautulli
    repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.0.1
+    version: 3.7.3
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/tautulli.png
 appVersion: v2.15.2
--- a/clusters/cl01tl/applications/tautulli/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/tautulli/templates/external-secret.yaml
@@ -4,8 +4,11 @@ metadata:
  name: tautulli-config-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: tautulli-config-backup-secret
    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
--- a/clusters/cl01tl/applications/tautulli/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/tautulli/templates/http-route.yaml
@@ -4,8 +4,11 @@ metadata:
  name: http-route-tautulli
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: http-route-tautulli
    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
--- a/clusters/cl01tl/applications/tautulli/templates/replication-source.yaml
+++ b/clusters/cl01tl/applications/tautulli/templates/replication-source.yaml
@@ -4,8 +4,11 @@ metadata:
  name: tautulli-config-backup-source
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: tautulli-config-backup-source
    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: tautulli-config
  trigger:
--- a/clusters/cl01tl/applications/tautulli/values.yaml
+++ b/clusters/cl01tl/applications/tautulli/values.yaml
@@ -24,6 +24,8 @@ tautulli:
            requests:
              cpu: 10m
              memory: 128Mi
+  serviceAccount:
+    create: true
  configMaps:
    scripts:
      enabled: true
@@ -125,7 +127,6 @@ tautulli:
          protocol: HTTP
  persistence:
    config:
-      forceRename: tautulli-config
      storageClass: ceph-block
      accessMode: ReadWriteOnce
      size: 5Gi
--- a/clusters/cl01tl/applications/tdarr/Chart.yaml
+++ b/clusters/cl01tl/applications/tdarr/Chart.yaml
@@ -21,7 +21,7 @@ dependencies:
  - name: app-template
    alias: tdarr
    repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.0.1
+    version: 3.7.3
  - name: tdarr-exporter
    version: 1.1.7
    repository: https://homeylab.github.io/helm-charts/
--- a/clusters/cl01tl/applications/tdarr/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/tdarr/templates/external-secret.yaml
@@ -4,8 +4,11 @@ metadata:
  name: tdarr-config-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: tdarr-config-backup-secret
    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
@@ -60,8 +63,11 @@ metadata:
  name: tdarr-server-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: tdarr-server-backup-secret
    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
--- a/clusters/cl01tl/applications/tdarr/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/tdarr/templates/http-route.yaml
@@ -4,8 +4,11 @@ metadata:
  name: http-route-tdarr
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: http-route-tdarr
    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
--- a/clusters/cl01tl/applications/tdarr/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/applications/tdarr/templates/persistent-volume-claim.yaml
@@ -4,8 +4,11 @@ metadata:
  name: tdarr-nfs-storage
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: tdarr-nfs-storage
    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: tdarr-nfs-storage
  storageClassName: nfs-client
--- a/clusters/cl01tl/applications/tdarr/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/applications/tdarr/templates/persistent-volume.yaml
@@ -4,8 +4,11 @@ metadata:
  name: tdarr-nfs-storage
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: tdarr-nfs-storage
    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
--- a/clusters/cl01tl/applications/tdarr/templates/replication-source.yaml
+++ b/clusters/cl01tl/applications/tdarr/templates/replication-source.yaml
@@ -4,8 +4,11 @@ metadata:
  name: tdarr-config-backup-source
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: tdarr-config-backup-source
    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: tdarr-config
  trigger:
@@ -30,8 +33,11 @@ metadata:
  name: tdarr-server-backup-source
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: tdarr-server-backup-source
    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: tdarr-server
  trigger:
--- a/clusters/cl01tl/applications/tdarr/values.yaml
+++ b/clusters/cl01tl/applications/tdarr/values.yaml
@@ -78,6 +78,8 @@ tdarr:
              gpu.intel.com/i915: 1
              cpu: 10m
              memory: 512Mi
+  serviceAccount:
+    create: true
  service:
    api:
      controller: server
@@ -152,5 +154,5 @@ tdarr-exporter:
      verify_ssl: false
  resources:
    requests:
-      cpu: 10m
+      cpu: 100m
      memory: 256Mi
--- a/clusters/cl01tl/applications/tubearchivist/Chart.yaml
+++ b/clusters/cl01tl/applications/tubearchivist/Chart.yaml
@@ -22,7 +22,7 @@ dependencies:
  - name: app-template
    alias: tubearchivist
    repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.0.1
+    version: 3.7.3
  - name: valkey
    version: 3.0.6
    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
@@ -30,4 +30,4 @@ dependencies:
    version: 21.6.3
    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/tube-archivist.png
-appVersion: v0.5.2
+appVersion: v0.5.1
--- a/clusters/cl01tl/applications/tubearchivist/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/tubearchivist/templates/external-secret.yaml
@@ -6,6 +6,9 @@ metadata:
  labels:
    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
@@ -35,6 +38,9 @@ metadata:
  labels:
    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
@@ -55,8 +61,11 @@ metadata:
  name: tubearchivist-wireguard-conf
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: tubearchivist-wireguard-conf
    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
--- a/clusters/cl01tl/applications/tubearchivist/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/tubearchivist/templates/http-route.yaml
@@ -4,8 +4,11 @@ metadata:
  name: http-route-tubearchivist
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: http-route-tubearchivist
    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
--- a/clusters/cl01tl/applications/tubearchivist/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/applications/tubearchivist/templates/persistent-volume-claim.yaml
@@ -4,8 +4,11 @@ metadata:
  name: tubearchivist-nfs-storage
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: tubearchivist-nfs-storage
    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: tubearchivist-nfs-storage
  storageClassName: nfs-client
--- a/clusters/cl01tl/applications/tubearchivist/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/applications/tubearchivist/templates/persistent-volume.yaml
@@ -4,8 +4,11 @@ metadata:
  name: tubearchivist-nfs-storage
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: tubearchivist-nfs-storage
    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
--- a/clusters/cl01tl/applications/tubearchivist/values.yaml
+++ b/clusters/cl01tl/applications/tubearchivist/values.yaml
@@ -31,6 +31,22 @@ tubearchivist:
          envFrom:
            - secretRef:
                name: tubearchivist-config-secret
+          probes:
+            liveness:
+              enabled: false
+              custom: true
+              spec:
+                exec:
+                  command:
+                    - /usr/bin/env
+                    - bash
+                    - -c
+                    - curl --fail http://localhost:8000/health
+                failureThreshold: 5
+                initialDelaySeconds: 60
+                periodSeconds: 30
+                successThreshold: 1
+                timeoutSeconds: 10
          resources:
            requests:
              cpu: 10m
@@ -77,6 +93,8 @@ tubearchivist:
              squat.ai/tun: "1"
              cpu: 10m
              memory: 128Mi
+  serviceAccount:
+    create: true
  service:
    main:
      controller: main
--- a/clusters/cl01tl/applications/vaultwarden/Chart.yaml
+++ b/clusters/cl01tl/applications/vaultwarden/Chart.yaml
@@ -21,11 +21,11 @@ dependencies:
  - name: app-template
    alias: vaultwarden
    repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.0.1
+    version: 3.7.3
  - name: cloudflared
    alias: cloudflared
    repository: oci://harbor.alexlebens.net/helm-charts
-    version: 1.15.0
+    version: 1.14.8
  - name: postgres-cluster
    alias: postgres-17-cluster
    version: 5.1.0
--- a/clusters/cl01tl/applications/vaultwarden/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/vaultwarden/templates/external-secret.yaml
@@ -4,8 +4,11 @@ metadata:
  name: vaultwarden-cloudflared-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: vaultwarden-cloudflared-secret
    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
@@ -26,8 +29,11 @@ metadata:
  name: vaultwarden-data-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: vaultwarden-data-backup-secret
    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
@@ -82,8 +88,11 @@ metadata:
  name: vaultwarden-postgresql-17-cluster-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: vaultwarden-postgresql-17-cluster-backup-secret
    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
--- a/clusters/cl01tl/applications/vaultwarden/templates/replication-source.yaml
+++ b/clusters/cl01tl/applications/vaultwarden/templates/replication-source.yaml
@@ -4,8 +4,11 @@ metadata:
  name: vaultwarden-data-backup-source
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: vaultwarden-data-backup-source
    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: vaultwarden-data
  trigger:
--- a/clusters/cl01tl/applications/vaultwarden/values.yaml
+++ b/clusters/cl01tl/applications/vaultwarden/values.yaml
@@ -27,6 +27,8 @@ vaultwarden:
            requests:
              cpu: 10m
              memory: 128Mi
+  serviceAccount:
+    create: true
  service:
    main:
      controller: main
@@ -36,8 +38,7 @@ vaultwarden:
          targetPort: 80
          protocol: HTTP
  persistence:
-    config:
-      forceRename: vaultwarden-data
+    data:
      storageClass: ceph-block
      accessMode: ReadWriteOnce
      size: 5Gi
--- 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: 4.0.1
+    version: 3.7.3
  - name: postgres-cluster
    alias: postgres-17-cluster
    version: 5.1.0
--- a/clusters/cl01tl/applications/yamtrack/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/yamtrack/templates/external-secret.yaml
@@ -4,8 +4,11 @@ metadata:
  name: yamtrack-config-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: yamtrack-config-secret
    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
@@ -33,8 +36,11 @@ metadata:
  name: yamtrack-oidc-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: yamtrack-oidc-secret
    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
@@ -55,8 +61,11 @@ metadata:
  name: yamtrack-postgresql-17-cluster-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: yamtrack-postgresql-17-cluster-backup-secret
    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
--- a/clusters/cl01tl/applications/yamtrack/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/yamtrack/templates/http-route.yaml
@@ -4,8 +4,11 @@ metadata:
  name: http-route-yamtrack
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: http-route-yamtrack
    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
--- a/clusters/cl01tl/applications/yamtrack/values.yaml
+++ b/clusters/cl01tl/applications/yamtrack/values.yaml
@@ -64,6 +64,8 @@ yamtrack:
            requests:
              cpu: 10m
              memory: 256Mi
+  serviceAccount:
+    create: true
  service:
    main:
      controller: main
--- a/clusters/cl01tl/deployment/argocd/templates/external-secret.yaml
+++ b/clusters/cl01tl/deployment/argocd/templates/external-secret.yaml
@@ -4,8 +4,11 @@ metadata:
  name: argocd-oidc-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: argocd-oidc-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: server
+    app.kubernetes.io/part-of: argocd
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
@@ -33,8 +36,12 @@ spec:
 #   name: argocd-gitea-repo-infrastructure-secret
 #   namespace: {{ .Release.Namespace }}
 #   labels:
-#     app.kubernetes.io/name: {{ .Release.Name }}
+#     app.kubernetes.io/name: argocd-gitea-repo-infrastructure-secret
 #     app.kubernetes.io/instance: {{ .Release.Name }}
+#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
+#     app.kubernetes.io/component: repo
+#     app.kubernetes.io/part-of: argocd
+#     argocd.argoproj.io/secret-type: repository
 # spec:
 #   secretStoreRef:
 #     kind: ClusterSecretStore
--- a/clusters/cl01tl/deployment/argocd/templates/http-route.yaml
+++ b/clusters/cl01tl/deployment/argocd/templates/http-route.yaml
@@ -4,8 +4,11 @@ metadata:
  name: http-route-argocd
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: http-route-argocd
    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
--- a/clusters/cl01tl/deployment/stack/templates/application-set.yaml
+++ b/clusters/cl01tl/deployment/stack/templates/application-set.yaml
@@ -8,6 +8,9 @@ metadata:
  labels:
    app.kubernetes.io/name: {{ $stack.name }}
    app.kubernetes.io/instance: {{ $stack.name }}
+    app.kubernetes.io/version: {{ $.Chart.AppVersion }}
+    app.kubernetes.io/component: {{ $stack.name }}
+    app.kubernetes.io/part-of: {{ $.Release.Name }}
 spec:
  syncPolicy:
    applicationsSync: create-update
--- a/clusters/cl01tl/deployment/stack/templates/application.yaml
+++ b/clusters/cl01tl/deployment/stack/templates/application.yaml
@@ -3,9 +3,6 @@ kind: Application
 metadata:
  name: cilium
  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: {{ $stack.name }}
-    app.kubernetes.io/instance: {{ $stack.name }}
  finalizers:
    - resources-finalizer.argocd.argoproj.io
 spec:
@@ -18,11 +15,11 @@ spec:
    name: in-cluster
    namespace: kube-system
  revisionHistoryLimit: 3
-  # ignoreDifferences:
-  #   - group: ""
-  #     kind: ServiceMonitor
-  #     jqPathExpressions:
-  #       - .spec.endpoints[].relabelings[].action
+  ignoreDifferences:
+    - group: ""
+      kind: ServiceMonitor
+      jqPathExpressions:
+        - .spec.endpoints[].relabelings[].action
  syncPolicy:
    automated:
      prune: true
@@ -45,9 +42,6 @@ kind: Application
 metadata:
  name: coredns
  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: {{ $stack.name }}
-    app.kubernetes.io/instance: {{ $stack.name }}
  finalizers:
    - resources-finalizer.argocd.argoproj.io
 spec:
@@ -63,7 +57,7 @@ spec:
  syncPolicy:
    automated:
      prune: true
-      selfHeal: true
+      selfHeal: false
    retry:
      limit: 10
      backoff:
@@ -82,9 +76,6 @@ kind: Application
 metadata:
  name: metrics-server
  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: {{ $stack.name }}
-    app.kubernetes.io/instance: {{ $stack.name }}
  finalizers:
    - resources-finalizer.argocd.argoproj.io
 spec:
@@ -100,7 +91,7 @@ spec:
  syncPolicy:
    automated:
      prune: true
-      selfHeal: true
+      selfHeal: false
    retry:
      limit: 10
      backoff:
@@ -119,9 +110,6 @@ kind: Application
 metadata:
  name: kubelet-serving-cert-approver
  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: {{ $stack.name }}
-    app.kubernetes.io/instance: {{ $stack.name }}
  finalizers:
    - resources-finalizer.argocd.argoproj.io
 spec:
@@ -156,9 +144,6 @@ kind: Application
 metadata:
  name: prometheus-operator-crds
  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: {{ $stack.name }}
-    app.kubernetes.io/instance: {{ $stack.name }}
  finalizers:
    - resources-finalizer.argocd.argoproj.io
 spec:
--- a/clusters/cl01tl/deployment/stack/values.yaml
+++ b/clusters/cl01tl/deployment/stack/values.yaml
@@ -54,10 +54,10 @@ applicationSet:
        kind: Service
        jqPathExpressions:
          - .spec.externalName
-      # - kind: StatefulSet
-      #   jqPathExpressions:
-      #     - .spec.volumeClaimTemplates[].apiVersion
-      #     - .spec.volumeClaimTemplates[].kind
+      - kind: StatefulSet
+        jqPathExpressions:
+          - .spec.volumeClaimTemplates[].apiVersion
+          - .spec.volumeClaimTemplates[].kind
    syncPolicy:
      automated:
        prune: true
@@ -70,10 +70,10 @@ applicationSet:
        kind: GpuDevicePlugin
        jqPathExpressions:
          - .metadata.annotations[]
-      # - kind: StatefulSet
-      #   jqPathExpressions:
-      #     - .spec.volumeClaimTemplates[].apiVersion
-      #     - .spec.volumeClaimTemplates[].kind
+      - kind: StatefulSet
+        jqPathExpressions:
+          - .spec.volumeClaimTemplates[].apiVersion
+          - .spec.volumeClaimTemplates[].kind
    syncPolicy:
      automated:
        prune: true