diff --git a/apps/production/cert-manager/kustomization.yaml b/apps/production/cert-manager/kustomization.yaml
index 4ed581d..21b9c53 100644
--- a/apps/production/cert-manager/kustomization.yaml
+++ b/apps/production/cert-manager/kustomization.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 namespace: cert-manager
 resources:
diff --git a/apps/production/metallb/kustomization.yaml b/apps/production/metallb/kustomization.yaml
index 2512ed3..f20d68d 100644
--- a/apps/production/metallb/kustomization.yaml
+++ b/apps/production/metallb/kustomization.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 namespace: metallb-system
 resources:
diff --git a/apps/production/traefik/kustomization.yaml b/apps/production/traefik/kustomization.yaml
index 53595d5..5098acd 100644
--- a/apps/production/traefik/kustomization.yaml
+++ b/apps/production/traefik/kustomization.yaml
@@ -1,7 +1,7 @@
 ---
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
-namespace: traefik-production
+namespace: traefik
 resources:
   - namespace.yaml
   - traefik.yaml
diff --git a/apps/production/traefik/namespace.yaml b/apps/production/traefik/namespace.yaml
index f6ad33d..0aa5938 100644
--- a/apps/production/traefik/namespace.yaml
+++ b/apps/production/traefik/namespace.yaml
@@ -2,4 +2,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: traefik-production
+  name: traefik
diff --git a/apps/production/traefik/traefik.yaml b/apps/production/traefik/traefik.yaml
index 4cb46ad..33f4116 100644
--- a/apps/production/traefik/traefik.yaml
+++ b/apps/production/traefik/traefik.yaml
@@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: traefik
-  namespace: traefik-production
+  namespace: traefik
 spec:
   interval: 24h
   url: https://helm.traefik.io/traefik
@@ -12,7 +12,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: traefik
-  namespace: traefik-production
+  namespace: traefik
 spec:
   chart:
     spec:
@@ -33,7 +33,7 @@ kind: Secret
 metadata:
   creationTimestamp: null
   name: traefik-secret
-  namespace: traefik-production
+  namespace: traefik
 stringData:
   values.yaml: |
     globalArguments:
diff --git a/clusters/production/flux-system/kustomization.yaml b/clusters/production/flux-system/kustomization.yaml
index 3842229..765b665 100644
--- a/clusters/production/flux-system/kustomization.yaml
+++ b/clusters/production/flux-system/kustomization.yaml
@@ -1,5 +1,5 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 resources:
-- gotk-components.yaml
-- gotk-sync.yaml
+  - gotk-components.yaml
+  - gotk-sync.yaml
diff --git a/infrastructure/crds/kustomization.yaml b/infrastructure/crds/kustomization.yaml
index fc6f383..0a5f4f8 100644
--- a/infrastructure/crds/kustomization.yaml
+++ b/infrastructure/crds/kustomization.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 namespace: flux-system
 resources:
diff --git a/infrastructure/kustomization.yaml b/infrastructure/kustomization.yaml
index d86465b..b5600af 100644
--- a/infrastructure/kustomization.yaml
+++ b/infrastructure/kustomization.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: kustomize.config.k8s.io/v1beta1
+apiVersion: kustomize.config.k8s.io/v1
 kind: Kustomization
 resources:
   - crds