From 88cf958c983f7b9a8f16b4741fd92427ba206aac Mon Sep 17 00:00:00 2001
From: auricom <27022259+auricom@users.noreply.github.com>
Date: Wed, 27 Mar 2024 20:36:43 +0100
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20app-template=20(?=
 =?UTF-8?q?=202.6.0=20=E2=86=92=203.0.4=20)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/mailrise/app/helmrelease.yaml     | 16 +++++-----
 .../media-browser/app/helmrelease.yaml        | 30 ++++++++++---------
 .../music-transcode/app/helmrelease.yaml      | 18 ++++++-----
 .../default/navidrome/app/helmrelease.yaml    | 27 ++++++++---------
 .../apps/default/outline/app/helmrelease.yaml | 26 ++++++++--------
 .../default/paperless/app/helmrelease.yaml    | 28 +++++++++--------
 .../apps/default/pgadmin/app/helmrelease.yaml | 27 ++++++++---------
 .../default/photoprism/app/helmrelease.yaml   | 20 +++++++------
 .../default/prowlarr/app/helmrelease.yaml     | 16 +++++-----
 .../app/github-releases/helmrelease.yaml      | 13 ++++----
 .../apps/default/pyload/app/helmrelease.yaml  | 20 +++++++------
 .../default/qbittorrent/app/helmrelease.yaml  | 26 ++++++++--------
 .../app/upgrade-p2pblocklist/helmrelease.yaml | 19 ++++++------
 13 files changed, 152 insertions(+), 134 deletions(-)

diff --git a/kubernetes/apps/default/mailrise/app/helmrelease.yaml b/kubernetes/apps/default/mailrise/app/helmrelease.yaml
index 68545f68f..d42bc1ad8 100644
--- a/kubernetes/apps/default/mailrise/app/helmrelease.yaml
+++ b/kubernetes/apps/default/mailrise/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,6 +23,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -36,13 +37,13 @@ spec:
             matchLabels:
               app.kubernetes.io/name: *app
     controllers:
-      main:
+      mailrise:
         replicas: 2
         strategy: RollingUpdate
         annotations:
           reloader.stakater.com/auto: "true"
         containers:
-          main:
+          app:
             image:
               repository: docker.io/yoryan/mailrise
               tag: 1.4.0
@@ -58,7 +59,8 @@ spec:
               limits:
                 memory: 200Mi
     service:
-      main:
+      app:
+        controller: *app
         type: LoadBalancer
         loadBalancerIP: "${CLUSTER_LB_MAILRISE}"
         externalTrafficPolicy: Local
@@ -66,7 +68,7 @@ spec:
           http:
             port: 8025
     ingress:
-      main:
+      app:
         enabled: true
         className: nginx
         annotations:
@@ -76,7 +78,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:
diff --git a/kubernetes/apps/default/media-browser/app/helmrelease.yaml b/kubernetes/apps/default/media-browser/app/helmrelease.yaml
index 7a9977e8c..f60a710ce 100644
--- a/kubernetes/apps/default/media-browser/app/helmrelease.yaml
+++ b/kubernetes/apps/default/media-browser/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,24 +23,25 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
   values:
     controllers:
-      main:
+      media-browser:
         annotations:
           reloader.stakater.com/auto: "true"
         containers:
-          main:
+          app:
             image:
               repository: docker.io/filebrowser/filebrowser
               tag: v2.27.0@sha256:00b75afd52a92e4525e3bcaf61caa2a31b8d878a5b371380686b1145cb0424fd
             env:
               TZ: "${TIMEZONE}"
-              FB_DATABASE: "/config/filebrowser.db"
-              FB_ROOT: "/mnt/storage"
-              FB_LOG: "stdout"
+              FB_DATABASE: /config/filebrowser.db
+              FB_ROOT: /mnt/storage
+              FB_LOG: stdout
               FB_NOAUTH: "true"
             probes:
               liveness: &probes
@@ -64,14 +65,15 @@ spec:
               limits:
                 memory: 500Mi
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: *port
     ingress:
-      main:
+      app:
         enabled: true
-        className: "nginx"
+        className: nginx
         annotations:
           nginx.ingress.kubernetes.io/auth-method: GET
           nginx.ingress.kubernetes.io/auth-url: http://authelia.default.svc.cluster.local.:8888/api/verify
@@ -84,7 +86,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:
@@ -98,21 +100,21 @@ spec:
       music:
         enabled: true
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/music
         globalMounts:
                 - path: /mnt/storage/music
       photo:
         enabled: true
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/photo
         globalMounts:
           - path: /mnt/storage/photo
       video:
         enabled: true
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/video
         globalMounts:
           - path: /mnt/storage/video
diff --git a/kubernetes/apps/default/music-transcode/app/helmrelease.yaml b/kubernetes/apps/default/music-transcode/app/helmrelease.yaml
index 8a40c495d..a2b672dd6 100644
--- a/kubernetes/apps/default/music-transcode/app/helmrelease.yaml
+++ b/kubernetes/apps/default/music-transcode/app/helmrelease.yaml
@@ -1,16 +1,16 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
-  name: music-transcode
+  name: &app music-transcode
   namespace: default
 spec:
   interval: 30m
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,24 +23,25 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
   values:
     controllers:
-      main:
+      music-transcode:
         type: cronjob
         cronjob:
           concurrencyPolicy: Forbid
           schedule: "@daily"
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/auricom/freac
               tag: 1.1.7@sha256:702e00632a740ac6c9213c6898f6f2e94be0663b2c06d10035e2f7acc95da849
             command:
-              - "/bin/bash"
-              - "-c"
+              - /bin/bash
+              - -c
               - |
                 #!/bin/bash
 
@@ -56,7 +57,8 @@ spec:
               TRANSCODE_OUTPUT_DIR: /mnt/music_transcoded/
               TRANSCODE_FREAC_BIN: /app/freaccmd
     service:
-      main:
+      app:
+        controller: *app
         enabled: false
     persistence:
       scripts:
diff --git a/kubernetes/apps/default/navidrome/app/helmrelease.yaml b/kubernetes/apps/default/navidrome/app/helmrelease.yaml
index 0845d47fe..f6aac7eb4 100644
--- a/kubernetes/apps/default/navidrome/app/helmrelease.yaml
+++ b/kubernetes/apps/default/navidrome/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,6 +23,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -33,9 +34,9 @@ spec:
         runAsUser: 568
         runAsGroup: 568
     controllers:
-      main:
+      navidrome:
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/navidrome/navidrome
               tag: 0.51.1@sha256:ea426987cc4a148eb6a9fcea60ab44cc0dca4d7f0f1e12a4b48f5937454da4d9
@@ -47,8 +48,8 @@ spec:
               ND_MUSICFOLDER: /mnt/storage/music/Artistes
               ND_PORT: &port 8080
               ND_PROMETHEUS_ENABLED: "true"
-              ND_REVERSEPROXYUSERHEADER: "Remote-User"
-              ND_REVERSEPROXYWHITELIST: "0.0.0.0/0"
+              ND_REVERSEPROXYUSERHEADER: Remote-User
+              ND_REVERSEPROXYWHITELIST: 0.0.0.0/0
               ND_SCANSCHEDULE: "@every 1h"
               ND_SESSIONTIMEOUT: 24h
             resources:
@@ -58,17 +59,15 @@ spec:
               limits:
                 memory: 750Mi
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: *port
-    serviceMonitor:
-      main:
-        enabled: true
     ingress:
-      main:
+      app:
         enabled: true
-        className: "nginx"
+        className: nginx
         annotations:
           nginx.ingress.kubernetes.io/auth-method: GET
           nginx.ingress.kubernetes.io/auth-url: http://authelia.default.svc.cluster.local.:8888/api/verify
@@ -83,7 +82,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:
@@ -96,7 +95,7 @@ spec:
           - path: /config
       music:
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/music
         globalMounts:
           - path: /mnt/storage/music
diff --git a/kubernetes/apps/default/outline/app/helmrelease.yaml b/kubernetes/apps/default/outline/app/helmrelease.yaml
index 680c15430..58f77ab61 100644
--- a/kubernetes/apps/default/outline/app/helmrelease.yaml
+++ b/kubernetes/apps/default/outline/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,6 +23,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -31,7 +32,7 @@ spec:
       namespace: database
   values:
     controllers:
-      main:
+      outline:
         annotations:
           reloader.stakater.com/auto: "true"
         initContainers:
@@ -43,7 +44,7 @@ spec:
               - secretRef:
                   name: outline-secret
         containers:
-          main:
+          app:
             image:
               repository: docker.io/outlinewiki/outline
               tag: 0.75.2@sha256:830923e3e7b4b3f2969db56a6033a03947f9a191d35b60a1fd80ed130ade5a1d
@@ -61,7 +62,7 @@ spec:
               OIDC_AUTH_URI: "https://auth.${SECRET_CLUSTER_DOMAIN}/api/oidc/authorization"
               OIDC_CLIENT_ID: outline
               OIDC_DISPLAY_NAME: Authelia
-              OIDC_SCOPES: "openid profile email offline_access"
+              OIDC_SCOPES: openid profile email offline_access
               OIDC_TOKEN_URI: "https://auth.${SECRET_CLUSTER_DOMAIN}/api/oidc/token"
               OIDC_USERINFO_URI: "https://auth.${SECRET_CLUSTER_DOMAIN}/api/oidc/userinfo"
               OIDC_USERNAME_CLAIM: email
@@ -74,9 +75,9 @@ spec:
               WEB_CONCURRENCY: 10
             command:
               [
-                "/bin/sh",
-                "-c",
-                "yarn db:migrate --env=production-ssl-disabled && yarn start --env=production-ssl-disabled",
+                /bin/sh,
+                -c,
+                yarn db:migrate --env=production-ssl-disabled && yarn start --env=production-ssl-disabled,
               ]
             resources:
               requests:
@@ -85,14 +86,15 @@ spec:
               limits:
                 memory: 750Mi
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: 8080
     ingress:
-      main:
+      app:
         enabled: true
-        className: "nginx"
+        className: nginx
         annotations:
           hajimari.io/icon: mdi:text-box-multiple
         hosts:
@@ -100,7 +102,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:
diff --git a/kubernetes/apps/default/paperless/app/helmrelease.yaml b/kubernetes/apps/default/paperless/app/helmrelease.yaml
index a29b963d9..458f1db16 100644
--- a/kubernetes/apps/default/paperless/app/helmrelease.yaml
+++ b/kubernetes/apps/default/paperless/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,6 +23,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -31,7 +32,7 @@ spec:
       namespace: database
   values:
     controllers:
-      main:
+      paperless:
         strategy: RollingUpdate
         annotations:
           reloader.stakater.com/auto: "true"
@@ -44,7 +45,7 @@ spec:
               - secretRef:
                   name: paperless-secret
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/paperless-ngx/paperless-ngx
               tag: 2.6.3@sha256:101f3cbfd1e15f9dc3303f2eeb64dd4a9489f121accb31612c9ff8be93ba8094
@@ -61,7 +62,7 @@ spec:
               PAPERLESS_DBNAME: paperless
               PAPERLESS_REDIS: redis://redis.database.svc.cluster.local.:6379
               PAPERLESS_TASK_WORKERS: 2
-              PAPERLESS_TIME_ZONE: "Europe/Paris"
+              PAPERLESS_TIME_ZONE: Europe/Paris
               PAPERLESS_URL: https://paperless.${SECRET_CLUSTER_DOMAIN}
             envFrom: *envFrom
             resources:
@@ -71,14 +72,15 @@ spec:
               limits:
                 memory: 7Gi
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: 8000
     ingress:
-      main:
+      app:
         enabled: true
-        className: "nginx"
+        className: nginx
         annotations:
           hajimari.io/icon: mdi:barcode-scan
         hosts:
@@ -86,7 +88,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:
@@ -95,28 +97,28 @@ spec:
       data:
         enabled: true
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/shared-documents/paperless/data
         globalMounts:
           - path: /usr/src/paperless/data
       media:
         enabled: true
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/shared-documents/paperless/media
         globalMounts:
           - path: /usr/src/paperless/media
       consume:
         enabled: true
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/shared-documents/paperless/watch
         globalMounts:
           - path: /usr/src/paperless/consume
       export:
         enabled: true
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/shared-documents/paperless/export
         globalMounts:
           - path: /usr/src/paperless/export
diff --git a/kubernetes/apps/default/pgadmin/app/helmrelease.yaml b/kubernetes/apps/default/pgadmin/app/helmrelease.yaml
index 395a23a82..b8a30062a 100644
--- a/kubernetes/apps/default/pgadmin/app/helmrelease.yaml
+++ b/kubernetes/apps/default/pgadmin/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,30 +23,28 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
   values:
     controllers:
-      main:
+      pgadmin:
         annotations:
           reloader.stakater.com/auto: "true"
         initContainers:
           volume-permissions:
             image:
               repository: dpage/pgadmin4
-              tag: "8.4@sha256:18cd5711fc9a7ed633a5c4b2b1a8f3e969d9262a94b8166c79fe0bba52697788"
-            command: ["/bin/chown", "-R", "5050:5050", "/var/lib/pgadmin"]
-            volumeMounts:
-              - name: config
-                mountPath: /var/lib/pgadmin
+              tag: 8.4@sha256:18cd5711fc9a7ed633a5c4b2b1a8f3e969d9262a94b8166c79fe0bba52697788
+            command: [/bin/chown, -R, 5050:5050, /var/lib/pgadmin]
             securityContext:
               runAsUser: 0
         containers:
-          main:
+          app:
             image:
               repository: dpage/pgadmin4
-              tag: "8.4@sha256:18cd5711fc9a7ed633a5c4b2b1a8f3e969d9262a94b8166c79fe0bba52697788"
+              tag: 8.4@sha256:18cd5711fc9a7ed633a5c4b2b1a8f3e969d9262a94b8166c79fe0bba52697788
             env:
               PGADMIN_CONFIG_ENHANCED_COOKIE_PROTECTION: "False"
             envFrom:
@@ -59,14 +57,15 @@ spec:
               limits:
                 memory: 500Mi
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: 80
     ingress:
-      main:
+      app:
         enabled: true
-        cClassName: "nginx"
+        className: nginx
         annotations:
           hajimari.io/icon: mdi:database
         hosts:
@@ -74,7 +73,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:
diff --git a/kubernetes/apps/default/photoprism/app/helmrelease.yaml b/kubernetes/apps/default/photoprism/app/helmrelease.yaml
index b8211d531..280894baf 100644
--- a/kubernetes/apps/default/photoprism/app/helmrelease.yaml
+++ b/kubernetes/apps/default/photoprism/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,6 +23,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -31,12 +32,12 @@ spec:
       namespace: database
   values:
     controllers:
-      main:
+      photoprism:
         strategy: RollingUpdate
         annotations:
           reloader.stakater.com/auto: "true"
         containers:
-          main:
+          app:
             image:
               repository: docker.io/photoprism/photoprism
               tag: latest@sha256:cbaf35b067efc179dee68ab703db8911c2ad306830831458abb369542ee4cf12
@@ -55,14 +56,15 @@ spec:
                 cpu: 100m
                 memory: 256Mi
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: 2342
     ingress:
-      main:
+      app:
         enabled: true
-        className: "nginx"
+        className: nginx
         annotations:
           external-dns.alpha.kubernetes.io/enabled: "true"
           external-dns.alpha.kubernetes.io/target: services.${SECRET_DOMAIN}.
@@ -78,7 +80,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:
@@ -91,7 +93,7 @@ spec:
           - path: *storage
       originals:
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: *originals
         globalMounts:
           - path: *originals
diff --git a/kubernetes/apps/default/prowlarr/app/helmrelease.yaml b/kubernetes/apps/default/prowlarr/app/helmrelease.yaml
index 5364c5639..a0fecce30 100644
--- a/kubernetes/apps/default/prowlarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/prowlarr/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,12 +23,13 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
   values:
     controllers:
-      main:
+      prowlarr:
         annotations:
           reloader.stakater.com/auto: "true"
         initContainers:
@@ -40,7 +41,7 @@ spec:
               - secretRef:
                   name: prowlarr-secret
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/onedr0p/prowlarr-nightly
               tag: 1.15.0.4357@sha256:0ff55a527517de4ec59b6e773e53abecbfa86d5fa30f8d0d1dbd54504a832fb7
@@ -59,14 +60,15 @@ spec:
               limits:
                 memory: 500Mi
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: *port
     ingress:
       main:
         enabled: true
-        className: "nginx"
+        className: nginx
         annotations:
           nginx.ingress.kubernetes.io/auth-method: GET
           nginx.ingress.kubernetes.io/auth-url: http://authelia.default.svc.cluster.local.:8888/api/verify
@@ -79,7 +81,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:
diff --git a/kubernetes/apps/default/pushover-notifier/app/github-releases/helmrelease.yaml b/kubernetes/apps/default/pushover-notifier/app/github-releases/helmrelease.yaml
index a1a18c7b9..352d3e668 100644
--- a/kubernetes/apps/default/pushover-notifier/app/github-releases/helmrelease.yaml
+++ b/kubernetes/apps/default/pushover-notifier/app/github-releases/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -28,11 +28,11 @@ spec:
     keepHistory: false
   values:
     controllers:
-      main:
+      pushover-notifier-github-releases:
         type: cronjob
         cronjob:
           concurrencyPolicy: Forbid
-          schedule: "23 */3 * * *"
+          schedule: 23 */3 * * *
         initContainers:
           init-db:
             image:
@@ -42,7 +42,7 @@ spec:
               - secretRef:
                   name: pushover-notifier-secret
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/auricom/python
               tag: 1.0.0@sha256:31210a11e180f24fb2f1450a724168ea339c3819b5a3500924f2a7d7ea27f01d
@@ -57,7 +57,8 @@ spec:
               limits:
                 memory: 250Mi
     service:
-      main:
+      app:
+        controller: *app
         enabled: false
     persistence:
       config:
diff --git a/kubernetes/apps/default/pyload/app/helmrelease.yaml b/kubernetes/apps/default/pyload/app/helmrelease.yaml
index 671a70968..bc58747cb 100644
--- a/kubernetes/apps/default/pyload/app/helmrelease.yaml
+++ b/kubernetes/apps/default/pyload/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,6 +23,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -34,9 +35,9 @@ spec:
         fsGroup: 568
         fsGroupChangePolicy: OnRootMismatch
     controllers:
-      main:
+      pyload:
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/auricom/pyload-ng
               tag: 0.5.0-b3.dev29@sha256:fd1343113033b3f8dcbbdad70a2bdbac20c40852a37f6925b9506a1f8d09e1c2
@@ -63,14 +64,15 @@ spec:
               readiness: *probe
               startup: *probe
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: 8000
     ingress:
-      main:
+      app:
         enabled: true
-        className: "nginx"
+        className: nginx
         annotations:
           nginx.ingress.kubernetes.io/auth-method: GET
           nginx.ingress.kubernetes.io/auth-url: http://authelia.default.svc.cluster.local.:8888/api/verify
@@ -83,7 +85,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:
@@ -96,7 +98,7 @@ spec:
           - path: /config
       downloads:
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/downloads
         globalMounts:
           - path: /mnt/storage/downloads
diff --git a/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml b/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml
index 333300e19..e5339c05b 100644
--- a/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml
+++ b/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -23,6 +23,7 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -34,9 +35,9 @@ spec:
         fsGroup: 568
         fsGroupChangePolicy: OnRootMismatch
     controllers:
-      main:
+      qbittorrent:
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/onedr0p/qbittorrent
               tag: 4.6.4@sha256:85f185207a81ec03e84b8302db06f1694c533c99e0efdb2acf0316d554d332e3
@@ -51,13 +52,14 @@ spec:
               limits:
                 memory: 8Gi
     service:
-      main:
+      app:
+        controller: *app
         ports:
           http:
             port: *port
       bittorent:
         enabled: true
-        controller: main
+        controller: *app
         type: LoadBalancer
         loadBalancerIP: "${CLUSTER_LB_QBITTORRENT}"
         ports:
@@ -68,9 +70,9 @@ spec:
             targetPort: *port-bt
         externalTrafficPolicy: Local
     ingress:
-      main:
+      app:
         enabled: true
-        className: "nginx"
+        className: nginx
         annotations:
           hajimari.io/icon: mdi:download
         hosts:
@@ -78,7 +80,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
         tls:
           - hosts:
@@ -91,19 +93,19 @@ spec:
           - path: /config
       downloads:
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/downloads
         globalMounts:
           - path: /mnt/storage/downloads
       music-qbittorrent:
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/music/.qbittorrent
         globalMounts:
           - path: /mnt/storage/music/.qbittorrent
       video-qbittorrent:
         type: nfs
-        server: "192.168.9.10"
+        server: 192.168.9.10
         path: /mnt/storage/video/.qbittorrent
         globalMounts:
           - path: /mnt/storage/video/.qbittorrent
diff --git a/kubernetes/apps/default/qbittorrent/app/upgrade-p2pblocklist/helmrelease.yaml b/kubernetes/apps/default/qbittorrent/app/upgrade-p2pblocklist/helmrelease.yaml
index 04ef2ee38..e952cdc0d 100644
--- a/kubernetes/apps/default/qbittorrent/app/upgrade-p2pblocklist/helmrelease.yaml
+++ b/kubernetes/apps/default/qbittorrent/app/upgrade-p2pblocklist/helmrelease.yaml
@@ -1,16 +1,16 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
-  name: qbittorrent-upgrade-p2pblocklist
+  name: &app qbittorrent-upgrade-p2pblocklist
   namespace: default
 spec:
   interval: 30m
   chart:
     spec:
       chart: app-template
-      version: 2.6.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -28,19 +28,19 @@ spec:
     keepHistory: false
   values:
     controllers:
-      main:
+      qbittorrent-upgrade-p2pblocklist:
         type: cronjob
         cronjob:
           concurrencyPolicy: Forbid
           schedule: "@daily"
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/auricom/kubectl
               tag: 1.29.2@sha256:693ced2697bb7c7349419d4035a62bd474fc41710675b344f71773d8a687dfc3
             command:
-              - "/bin/bash"
-              - "-c"
+              - /bin/bash
+              - -c
               - |
                 #!/bin/bash
 
@@ -59,8 +59,9 @@ spec:
                   exit 1
                 fi
     service:
-      main:
+      app:
+        controller: *app
         enabled: false
     serviceAccount:
       create: false
-      name: "jobs"
+      name: jobs