diff --git a/apps/actual/actual-boet/helmrelease.yaml b/apps/actual/actual-boet/helmrelease.yaml
index 4421df495..2081795d2 100644
--- a/apps/actual/actual-boet/helmrelease.yaml
+++ b/apps/actual/actual-boet/helmrelease.yaml
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 3.1.0
+      version: 3.6.1
       interval: 30m
       sourceRef:
         kind: HelmRepository
diff --git a/apps/actual/actual-nathalie/helmrelease.yaml b/apps/actual/actual-nathalie/helmrelease.yaml
index a1bb0ce16..17d8fdf16 100644
--- a/apps/actual/actual-nathalie/helmrelease.yaml
+++ b/apps/actual/actual-nathalie/helmrelease.yaml
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 3.1.0
+      version: 3.6.1
       interval: 30m
       sourceRef:
         kind: HelmRepository
diff --git a/apps/actual/actual-shared/helmrelease.yaml b/apps/actual/actual-shared/helmrelease.yaml
index 6a35ebed4..37b04d149 100644
--- a/apps/actual/actual-shared/helmrelease.yaml
+++ b/apps/actual/actual-shared/helmrelease.yaml
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 3.1.0
+      version: 3.6.1
       interval: 30m
       sourceRef:
         kind: HelmRepository
diff --git a/apps/esphome/esphome.yaml b/apps/esphome/esphome.yaml
index df9f1adab..fd8a2cffd 100644
--- a/apps/esphome/esphome.yaml
+++ b/apps/esphome/esphome.yaml
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.3.1
+      version: 3.6.1
       interval: 30m
       sourceRef:
         kind: HelmRepository
diff --git a/apps/kobotools.yaml b/apps/kobotools.yaml
index 7ebddfcf8..4dc3d3d9a 100644
--- a/apps/kobotools.yaml
+++ b/apps/kobotools.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.2.0
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/apps/libreddit.yaml b/apps/libreddit.yaml
index b136c53c2..c8faf7541 100644
--- a/apps/libreddit.yaml
+++ b/apps/libreddit.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.2.0
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/apps/miniflux/miniflux.yaml b/apps/miniflux/miniflux.yaml
index a240b1fdc..761ae54f6 100644
--- a/apps/miniflux/miniflux.yaml
+++ b/apps/miniflux/miniflux.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.3.2
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/apps/paperless/helmrelease.yaml b/apps/paperless/helmrelease.yaml
index caae457bf..a30967388 100644
--- a/apps/paperless/helmrelease.yaml
+++ b/apps/paperless/helmrelease.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 3.2.1
+      version: 3.6.1
       interval: 30m
       sourceRef:
         kind: HelmRepository
diff --git a/apps/spoolman/helmrelease.yaml b/apps/spoolman/helmrelease.yaml
index 3b30425c6..1f028584f 100644
--- a/apps/spoolman/helmrelease.yaml
+++ b/apps/spoolman/helmrelease.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 3.2.1
+      version: 3.6.1
       interval: 30m
       sourceRef:
         kind: HelmRepository
diff --git a/apps/vaultwarden/helmrelease.yaml b/apps/vaultwarden/helmrelease.yaml
index 039e607b7..8dcf24599 100644
--- a/apps/vaultwarden/helmrelease.yaml
+++ b/apps/vaultwarden/helmrelease.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.3.2
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/apps/zipline/zipline.yaml b/apps/zipline/zipline.yaml
index 4d102c1b2..86281913d 100644
--- a/apps/zipline/zipline.yaml
+++ b/apps/zipline/zipline.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 3.1.0
+      version: 3.6.1
       interval: 30m
       sourceRef:
         kind: HelmRepository
diff --git a/automation/zigbee2mqtt/exporter.yaml b/automation/zigbee2mqtt/exporter.yaml
index 3ffee5a19..94620498f 100644
--- a/automation/zigbee2mqtt/exporter.yaml
+++ b/automation/zigbee2mqtt/exporter.yaml
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.5.1
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/automation/zigbee2mqtt/helmrelease.yaml b/automation/zigbee2mqtt/helmrelease.yaml
index a3083ca0c..d286a69aa 100644
--- a/automation/zigbee2mqtt/helmrelease.yaml
+++ b/automation/zigbee2mqtt/helmrelease.yaml
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.4.0
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/infrastructure/monitoring/shelly-exporter.yaml b/infrastructure/monitoring/shelly-exporter.yaml
index c3f565213..7590068f1 100644
--- a/infrastructure/monitoring/shelly-exporter.yaml
+++ b/infrastructure/monitoring/shelly-exporter.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 3.0.4
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/media/bazarr.yaml b/media/bazarr.yaml
index 55c41baf0..6ae67a4ca 100644
--- a/media/bazarr.yaml
+++ b/media/bazarr.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.5.0
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/media/emby.yaml b/media/emby.yaml
index f3b82e8be..d5ecf64b0 100644
--- a/media/emby.yaml
+++ b/media/emby.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 0.2.2
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/media/ombi.yaml b/media/ombi.yaml
index 6ad61dfaf..0b2096c35 100644
--- a/media/ombi.yaml
+++ b/media/ombi.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 0.2.2
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/media/prowlarr.yaml b/media/prowlarr.yaml
index 976df9265..b4254ea9f 100644
--- a/media/prowlarr.yaml
+++ b/media/prowlarr.yaml
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.5.1
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/media/qbittorrent.yaml b/media/qbittorrent.yaml
index 92f110ec8..1187d7dbd 100644
--- a/media/qbittorrent.yaml
+++ b/media/qbittorrent.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 0.2.2
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/media/radarr.yaml b/media/radarr.yaml
index a9c926a8f..37388240d 100644
--- a/media/radarr.yaml
+++ b/media/radarr.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 0.2.2
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts
diff --git a/media/sonarr.yaml b/media/sonarr.yaml
index 7dc0ac916..d5144d249 100644
--- a/media/sonarr.yaml
+++ b/media/sonarr.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 0.2.2
+      version: 3.6.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s-charts