diff --git a/base/templates/release.yaml b/base/templates/release.yaml
index 2266dc5..b02bf71 100644
--- a/base/templates/release.yaml
+++ b/base/templates/release.yaml
@@ -2,7 +2,7 @@
 {{- if ($config.enabled | default false) }}
 {{- $componentName := $config.name | default $componentInstance }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ printf "%s-%s" $.Release.Name $componentInstance | replace (printf "%s-%s" $.Release.Name $.Release.Name) $.Release.Name }}"
diff --git a/docs/infra/_index.md b/docs/infra/_index.md
index 7da5f53..1e6069d 100644
--- a/docs/infra/_index.md
+++ b/docs/infra/_index.md
@@ -50,7 +50,7 @@ spec:
   #   secretRef:
   #     name: gpg-publickey
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: infra <4>
diff --git a/docs/mycloud/_index.md b/docs/mycloud/_index.md
index 19a02b7..36e680b 100644
--- a/docs/mycloud/_index.md
+++ b/docs/mycloud/_index.md
@@ -69,7 +69,7 @@ spec:
   #     name: gpg-publickey
 
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: mycloud <1>
diff --git a/infra-certificates/templates/certmanager/release.yaml b/infra-certificates/templates/certmanager/release.yaml
index be0f59b..285ed95 100644
--- a/infra-certificates/templates/certmanager/release.yaml
+++ b/infra-certificates/templates/certmanager/release.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: cert-manager
diff --git a/infra-ingress/templates/traefik/release.yaml b/infra-ingress/templates/traefik/release.yaml
index 5568bff..6c5e4e8 100644
--- a/infra-ingress/templates/traefik/release.yaml
+++ b/infra-ingress/templates/traefik/release.yaml
@@ -1,6 +1,6 @@
 {{- if (eq .Values.controller "traefik") }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: traefik
diff --git a/infra-monitoring/templates/alertmanager/authentik-application.yaml b/infra-monitoring/templates/alertmanager/authentik-application.yaml
index 50514c3..a990905 100644
--- a/infra-monitoring/templates/alertmanager/authentik-application.yaml
+++ b/infra-monitoring/templates/alertmanager/authentik-application.yaml
@@ -3,7 +3,7 @@
   .Values.alertmanager.ingress.enabled
 }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: authentik-application-alertmanager
diff --git a/infra-monitoring/templates/alertmanager/matrix/release.yaml b/infra-monitoring/templates/alertmanager/matrix/release.yaml
index e9a549b..e8f88cd 100644
--- a/infra-monitoring/templates/alertmanager/matrix/release.yaml
+++ b/infra-monitoring/templates/alertmanager/matrix/release.yaml
@@ -1,7 +1,7 @@
 {{- with .Values.alertmanager.receiver.matrix }}
 {{- if .enabled }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "alertmanager-matrix"
diff --git a/infra-monitoring/templates/alertmanager/ntfy/release.yaml b/infra-monitoring/templates/alertmanager/ntfy/release.yaml
index f2f2868..adef484 100644
--- a/infra-monitoring/templates/alertmanager/ntfy/release.yaml
+++ b/infra-monitoring/templates/alertmanager/ntfy/release.yaml
@@ -1,7 +1,7 @@
 {{- with .Values.alertmanager.receiver.ntfy }}
 {{- if .enabled }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "alertmanager-ntfy"
diff --git a/infra-monitoring/templates/exporter/blackbox/release.yaml b/infra-monitoring/templates/exporter/blackbox/release.yaml
index 314d415..b53bbfc 100644
--- a/infra-monitoring/templates/exporter/blackbox/release.yaml
+++ b/infra-monitoring/templates/exporter/blackbox/release.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.prometheus.exporter.blackbox.enabled }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: prometheus-blackbox-exporter
diff --git a/infra-monitoring/templates/grafana/authentik-application.yaml b/infra-monitoring/templates/grafana/authentik-application.yaml
index f8b45d2..fbffdd1 100644
--- a/infra-monitoring/templates/grafana/authentik-application.yaml
+++ b/infra-monitoring/templates/grafana/authentik-application.yaml
@@ -3,7 +3,7 @@
   .Values.grafana.ingress.enabled
 }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: authentik-application-grafana
diff --git a/infra-monitoring/templates/karma/authentik-application.yaml b/infra-monitoring/templates/karma/authentik-application.yaml
index 3fe502b..6ba5070 100644
--- a/infra-monitoring/templates/karma/authentik-application.yaml
+++ b/infra-monitoring/templates/karma/authentik-application.yaml
@@ -3,7 +3,7 @@
   .Values.karma.enabled
 }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: authentik-application-karma
diff --git a/infra-monitoring/templates/karma/release.yaml b/infra-monitoring/templates/karma/release.yaml
index fd65ce2..821f4a9 100644
--- a/infra-monitoring/templates/karma/release.yaml
+++ b/infra-monitoring/templates/karma/release.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.karma.enabled }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: karma
diff --git a/infra-monitoring/templates/kube-prometheus-stack/release.yaml b/infra-monitoring/templates/kube-prometheus-stack/release.yaml
index 27d4a01..7a115b0 100644
--- a/infra-monitoring/templates/kube-prometheus-stack/release.yaml
+++ b/infra-monitoring/templates/kube-prometheus-stack/release.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: kube-prometheus-stack
diff --git a/infra-monitoring/templates/prometheus/authentik-application.yaml b/infra-monitoring/templates/prometheus/authentik-application.yaml
index 901dab0..24c7e0f 100644
--- a/infra-monitoring/templates/prometheus/authentik-application.yaml
+++ b/infra-monitoring/templates/prometheus/authentik-application.yaml
@@ -3,7 +3,7 @@
   .Values.prometheus.ingress.enabled
 }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: authentik-application-prometheus
diff --git a/infra-monitoring/templates/tempo/release.yaml b/infra-monitoring/templates/tempo/release.yaml
index cb1a49b..71251fe 100644
--- a/infra-monitoring/templates/tempo/release.yaml
+++ b/infra-monitoring/templates/tempo/release.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.tempo.enabled }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: tempo
diff --git a/infra-trivy/templates/release.yaml b/infra-trivy/templates/release.yaml
index 63a3768..0b0de4c 100644
--- a/infra-trivy/templates/release.yaml
+++ b/infra-trivy/templates/release.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: trivy-operator
diff --git a/mycloud-authentik/templates/release.yaml b/mycloud-authentik/templates/release.yaml
index 0fe0d24..95e9296 100644
--- a/mycloud-authentik/templates/release.yaml
+++ b/mycloud-authentik/templates/release.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-hr"
diff --git a/mycloud-collabora/templates/release.yaml b/mycloud-collabora/templates/release.yaml
index a83281a..b328c03 100644
--- a/mycloud-collabora/templates/release.yaml
+++ b/mycloud-collabora/templates/release.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-hr"
diff --git a/mycloud-firefly-iii/templates/authentik-application.yaml b/mycloud-firefly-iii/templates/authentik-application.yaml
index 50992bc..d9ed00c 100644
--- a/mycloud-firefly-iii/templates/authentik-application.yaml
+++ b/mycloud-firefly-iii/templates/authentik-application.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: {{ .Release.Name }}-auth
diff --git a/mycloud-firefly-iii/templates/release.yaml b/mycloud-firefly-iii/templates/release.yaml
index f58f4ee..023c56c 100644
--- a/mycloud-firefly-iii/templates/release.yaml
+++ b/mycloud-firefly-iii/templates/release.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-hr"
diff --git a/mycloud-gotosocial/templates/authentik-application.yaml b/mycloud-gotosocial/templates/authentik-application.yaml
index 2fe2d9c..89c2e1c 100644
--- a/mycloud-gotosocial/templates/authentik-application.yaml
+++ b/mycloud-gotosocial/templates/authentik-application.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: {{ .Release.Name }}-auth
diff --git a/mycloud-gotosocial/templates/release.yaml b/mycloud-gotosocial/templates/release.yaml
index e2ca86f..3e38f6f 100644
--- a/mycloud-gotosocial/templates/release.yaml
+++ b/mycloud-gotosocial/templates/release.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-hr"
diff --git a/mycloud-nextcloud/templates/authentik-application.yaml b/mycloud-nextcloud/templates/authentik-application.yaml
index abb8037..7b9f9e5 100644
--- a/mycloud-nextcloud/templates/authentik-application.yaml
+++ b/mycloud-nextcloud/templates/authentik-application.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: {{ .Release.Name }}-auth
diff --git a/mycloud-nextcloud/templates/release.yaml b/mycloud-nextcloud/templates/release.yaml
index 0b02b52..c178164 100644
--- a/mycloud-nextcloud/templates/release.yaml
+++ b/mycloud-nextcloud/templates/release.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-hr"
diff --git a/mycloud-services/templates/postgresql/release.yaml b/mycloud-services/templates/postgresql/release.yaml
index afc0ec1..8645e61 100644
--- a/mycloud-services/templates/postgresql/release.yaml
+++ b/mycloud-services/templates/postgresql/release.yaml
@@ -9,7 +9,7 @@ spec:
   ref:
     semver: "^0.2.3"
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: "{{ .Release.Name }}-postgresql"
diff --git a/template/templates/authentik-application.yaml b/template/templates/authentik-application.yaml
index c02410c..c3a91ae 100644
--- a/template/templates/authentik-application.yaml
+++ b/template/templates/authentik-application.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: {{ .Release.Name }}-auth