diff --git a/apps/code-kustomization.yaml b/apps/code-kustomization.yaml
index 62419a3506fe437a5c88069eaf62c96b74b6444c..bd6071be35704255e62e1f0bb5f752e334962c15 100644
--- a/apps/code-kustomization.yaml
+++ b/apps/code-kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: stackspout-apps
diff --git a/apps/code/gitea-kustomization.yaml b/apps/code/gitea-kustomization.yaml
index 12ceb543b63693c3d4ca0d0b04c8dc1d2a0a81c4..d927d82713bf966576ba5f9d1d2827f991736597 100644
--- a/apps/code/gitea-kustomization.yaml
+++ b/apps/code/gitea-kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: gitea
diff --git a/apps/code/gitea/kustomization.yaml b/apps/code/gitea/kustomization.yaml
index 938a8c1db66a324eb7742c815d04640c190e7bcb..364152c769f916fe494ebac54c870918a97b54d9 100644
--- a/apps/code/gitea/kustomization.yaml
+++ b/apps/code/gitea/kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 resources:
   - gitea-release.yaml
diff --git a/apps/do/do-test/kustomization.yaml b/apps/do/do-test/kustomization.yaml
index 4aa48ff803106503f64443cd7b061917588c6e2f..54362b7fcf624329f57ce958ee6e08ef1dd4d570 100644
--- a/apps/do/do-test/kustomization.yaml
+++ b/apps/do/do-test/kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 resources:
   - vikunja-oauth-client.yaml
diff --git a/apps/do/vikunja-kustomization.yaml b/apps/do/vikunja-kustomization.yaml
index 332d5bcf26e7ef55bd7fc75444a1fcc17d3f3779..2c0a2f1edff897ff933a67450f13224c3fe07c4c 100644
--- a/apps/do/vikunja-kustomization.yaml
+++ b/apps/do/vikunja-kustomization.yaml
@@ -1,5 +1,5 @@
 
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: vikunja
diff --git a/apps/do/vikunja-test-kustomization.yaml b/apps/do/vikunja-test-kustomization.yaml
index aafb0370469725b27d24be02d1e37bc0cb8a4f94..c3290ed1ffb7929b868055ef7d94bd7ecb979e12 100644
--- a/apps/do/vikunja-test-kustomization.yaml
+++ b/apps/do/vikunja-test-kustomization.yaml
@@ -1,5 +1,5 @@
 
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: vikunja-test
diff --git a/apps/do/vikunja/kustomization.yaml b/apps/do/vikunja/kustomization.yaml
index 8520b27355477a8cd9d9f0abb2e4dc5e8a6a4f78..ad6bfb6446fcec266c0b6a7a4a37323485147528 100644
--- a/apps/do/vikunja/kustomization.yaml
+++ b/apps/do/vikunja/kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 resources:
   - vikunja-oauth-client.yaml
diff --git a/apps/forge-kustomization.yaml b/apps/forge-kustomization.yaml
index 489a13850c59b6c2a368073f87983335888cc5cd..89efa1751996510b93406be264f7d565715d6b88 100644
--- a/apps/forge-kustomization.yaml
+++ b/apps/forge-kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: stackspout-apps
diff --git a/apps/forge/forgejo-kustomization.yaml b/apps/forge/forgejo-kustomization.yaml
index f77286c923fa8c962d7206e70747d5f26f8959ba..e05618893a81726d9d82e609f323d09d7a2aaa8f 100644
--- a/apps/forge/forgejo-kustomization.yaml
+++ b/apps/forge/forgejo-kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: forgejo
diff --git a/apps/generate-kustomizations.sh b/apps/generate-kustomizations.sh
index 857f418630dc8e1a65d0492fe556a7f900f5b766..7a5ce1a16963664dd0bf975d379970f6fb5764a0 100755
--- a/apps/generate-kustomizations.sh
+++ b/apps/generate-kustomizations.sh
@@ -2,7 +2,7 @@
 # Generates kubernetes kustomizations
 if test $# -gt 0
 then dir=$1
-	{ echo 'apiVersion: kustomize.config.k8s.io/v1beta1
+	{ echo 'apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 resources:'
 	find $dir -maxdepth 1 -type f -name "*.yaml" -not -name "kustomization.yaml" -printf "  - %f\n"; } | tee $dir/kustomization.yaml
diff --git a/apps/kustomization.yaml b/apps/kustomization.yaml
index f6e32efe82d1ab50a7ba7be26a509b44abeb7cb6..78839facf0756a1a35f2e16d0660c37e737f31cb 100644
--- a/apps/kustomization.yaml
+++ b/apps/kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 resources:
   - ninja-kustomization.yaml
diff --git a/apps/ninja-kustomization.yaml b/apps/ninja-kustomization.yaml
index cbbfb79c2cf4e3cc7b0e3b060bcd02173f55f536..c7313fa11ccf9ba28a800304081a8e1ab08556c4 100644
--- a/apps/ninja-kustomization.yaml
+++ b/apps/ninja-kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: add-ninja
diff --git a/apps/ninja/invoiceninja-kustomization.yaml b/apps/ninja/invoiceninja-kustomization.yaml
index 6089821c07deac686d4eff220ecbd6bc2f46bd3c..150c55db77b384bb348a67662b26c71a8869b937 100644
--- a/apps/ninja/invoiceninja-kustomization.yaml
+++ b/apps/ninja/invoiceninja-kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: invoiceninja
@@ -22,13 +22,14 @@ spec:
   postBuild:
     substituteFrom:
       - kind: Secret
-        name: stackspout-invoiceninja-variables
+        name: stackspin-cluster-variables
       - kind: Secret
-        name: stackspout-invoiceninja-oauth-variables
-        optional: true
+        name: stackspout-invoiceninja-variables
       - kind: ConfigMap
         name: stackspout-invoiceninja-kustomization-variables
       - kind: Secret
-        name: stackspin-cluster-variables
+        name: stackspout-invoiceninja-oauth-variables
+        optional: true
       - kind: ConfigMap
         name: stackspin-single-sign-on-kustomization-variables
+        optional: true
diff --git a/apps/ninja/invoiceninja-secrets-kustomization.yaml b/apps/ninja/invoiceninja-secrets-kustomization.yaml
index 992f8d7d9438b636ba4a24535f615d9eb3c70b77..6dd992510d84e3c4bd75e38f7b8813fddc0b486f 100644
--- a/apps/ninja/invoiceninja-secrets-kustomization.yaml
+++ b/apps/ninja/invoiceninja-secrets-kustomization.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: invoiceninja-secrets
diff --git a/apps/ninja/invoiceninja-secrets/kustomization.yaml b/apps/ninja/invoiceninja-secrets/kustomization.yaml
index 01e50f0dd3de31baddfee2dc5a929c4766d299eb..1fe405ce2663cc22ff36a3a7f243cd4e2576c520 100644
--- a/apps/ninja/invoiceninja-secrets/kustomization.yaml
+++ b/apps/ninja/invoiceninja-secrets/kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 resources:
   - invoiceninja-variables.yaml
diff --git a/apps/ninja/invoiceninja/kustomization.yaml b/apps/ninja/invoiceninja/kustomization.yaml
index bed32ae61c328d6d0773305a784e5e513f99e2ea..bd82a0181f4fed513c8bcd654c2d8bf880b250dc 100644
--- a/apps/ninja/invoiceninja/kustomization.yaml
+++ b/apps/ninja/invoiceninja/kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 resources:
   - invoiceninja-mariadb-pvc.yaml
diff --git a/apps/people/suitecrm/kustomization.yaml b/apps/people/suitecrm/kustomization.yaml
index 6ebe0bcdaf15dc4abcb32f457d2de8ed356997df..8e552e344dfe23d841b838c0733b14256ee0dbae 100644
--- a/apps/people/suitecrm/kustomization.yaml
+++ b/apps/people/suitecrm/kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 resources:
   - suitecrm-values-configmap.yaml
diff --git a/apps/support/zammad-kustomization.yaml b/apps/support/zammad-kustomization.yaml
index ebc080a5d5014e2115e594b35102c9aa007f49e4..3afbd0dbd094a14bb720a372c9253cbce0832c26 100644
--- a/apps/support/zammad-kustomization.yaml
+++ b/apps/support/zammad-kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: zammad
diff --git a/infrastructure/kustomizations/apps-kustomization.yaml b/infrastructure/kustomizations/apps-kustomization.yaml
index 14c1d123563e4b43774f619fd6d22018f9b8bb41..dab420d0b7bd52c6cac52e30084d68f5913f3d58 100644
--- a/infrastructure/kustomizations/apps-kustomization.yaml
+++ b/infrastructure/kustomizations/apps-kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: stackspout-apps
diff --git a/infrastructure/kustomizations/namespace-kustomization.yaml b/infrastructure/kustomizations/namespace-kustomization.yaml
index 0d483cb94235c4ca308b915c4772d56ae72bc9ea..02a4676ad5e97094ef48cfbbd0dcab7ac9687b53 100644
--- a/infrastructure/kustomizations/namespace-kustomization.yaml
+++ b/infrastructure/kustomizations/namespace-kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: stackspout-namespace
diff --git a/infrastructure/kustomizations/overrides-kustomization.yaml b/infrastructure/kustomizations/overrides-kustomization.yaml
index 5427f2674e2e53b1ed1c63617f11a744fa84a262..d2ef7693fb490cf26da1998fabde6eb492879754 100644
--- a/infrastructure/kustomizations/overrides-kustomization.yaml
+++ b/infrastructure/kustomizations/overrides-kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: stackspout-overrides
diff --git a/infrastructure/kustomizations/sources-kustomization.yaml b/infrastructure/kustomizations/sources-kustomization.yaml
index cd8179ac56a72fb4cc10c8cd14adcc615ac79a34..c6d276bc01d7825f8816da419f03a2527f38c379 100644
--- a/infrastructure/kustomizations/sources-kustomization.yaml
+++ b/infrastructure/kustomizations/sources-kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: stackspout-sources
diff --git a/infrastructure/sources/8gears-n8n-helmrepository.yaml b/infrastructure/sources/8gears-n8n-helmrepository.yaml
index 5d228f3e677fc1226dac16bc87c98eee0b468a20..e0850584156e23438d50461de928e5fcd74e5413 100644
--- a/infrastructure/sources/8gears-n8n-helmrepository.yaml
+++ b/infrastructure/sources/8gears-n8n-helmrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: 8gears-n8n
diff --git a/infrastructure/sources/forgejo-helmrepository.yaml b/infrastructure/sources/forgejo-helmrepository.yaml
index 922f29574e07c01eceadef46f2f7432609f07335..a5622bee9bad030b1954414a861671ea79d90d09 100644
--- a/infrastructure/sources/forgejo-helmrepository.yaml
+++ b/infrastructure/sources/forgejo-helmrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: forgejo
diff --git a/infrastructure/sources/gitea-helmrepository.yaml b/infrastructure/sources/gitea-helmrepository.yaml
index 1ab8d38c8b797ddb03451306d4d839593420585b..01bec3a4530a86ce83719bcd4f9b408c2ea04db8 100644
--- a/infrastructure/sources/gitea-helmrepository.yaml
+++ b/infrastructure/sources/gitea-helmrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: gitea
diff --git a/infrastructure/sources/invoiceninja-helmrepository.yaml b/infrastructure/sources/invoiceninja-helmrepository.yaml
index 2abfbdf3efc52bfc8e379760109877ef8cfa3cc3..fa4111046a5cce8428ab6e9ca0037f4d360e55f1 100644
--- a/infrastructure/sources/invoiceninja-helmrepository.yaml
+++ b/infrastructure/sources/invoiceninja-helmrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: invoiceninja
diff --git a/infrastructure/sources/robjuz-helmrepository.yaml b/infrastructure/sources/robjuz-helmrepository.yaml
index 8074644cba5cdf8922be2fcbbe55b167f1449f3c..17f027fb41cf8bb7a6c82b46dadf77c4506319f6 100644
--- a/infrastructure/sources/robjuz-helmrepository.yaml
+++ b/infrastructure/sources/robjuz-helmrepository.yaml
@@ -1,5 +1,5 @@
 # For kimai2
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: robjuz
diff --git a/infrastructure/sources/truecharts-helmrepository.yaml b/infrastructure/sources/truecharts-helmrepository.yaml
index e16b390b1b21e2c8e9a550fdfc8b7a865db8a8bc..bfa4ad4839deeca107d3bfa8f9b23de5472ec61b 100644
--- a/infrastructure/sources/truecharts-helmrepository.yaml
+++ b/infrastructure/sources/truecharts-helmrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: truecharts
diff --git a/infrastructure/sources/vikunja-helmrepository.yaml b/infrastructure/sources/vikunja-helmrepository.yaml
index 87c9a4e67e5e9470622259e4592735c658d1003f..eaa73a9ccac5f945465d7fe4b0b6b3b8b76d97cf 100644
--- a/infrastructure/sources/vikunja-helmrepository.yaml
+++ b/infrastructure/sources/vikunja-helmrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: vikunja
diff --git a/infrastructure/sources/zammad.yaml b/infrastructure/sources/zammad.yaml
index 8972876c6b368d1eb0bb8e950e193072e59e9cb8..752e048a3dc6afd24211ac2a272d1ee55fc01c24 100644
--- a/infrastructure/sources/zammad.yaml
+++ b/infrastructure/sources/zammad.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: zammad