diff --git a/cluster/base/infra.yaml b/cluster/base/infra.yaml
index 0d8e27d..3662c06 100644
--- a/cluster/base/infra.yaml
+++ b/cluster/base/infra.yaml
@@ -1,10 +1,28 @@
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
+metadata:
+  name: infra-namespaces
+  namespace: flux-system
+spec:
+  interval: 1h0m0s
+  path: ./infra/namespaces
+  prune: true
+  retryInterval: 1m0s
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  timeout: 5m0s
+  wait: true
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
 metadata:
   name: infra-controllers
   namespace: flux-system
 spec:
+  dependsOn:
+  - name: infra-namespaces
   interval: 1h0m0s
   path: ./infra/controllers
   prune: true
diff --git a/infra/controllers/1password.yaml b/infra/controllers/1password.yaml
index 30c9d7d..4358c55 100644
--- a/infra/controllers/1password.yaml
+++ b/infra/controllers/1password.yaml
@@ -1,9 +1,4 @@
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: 1password-system
----
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
diff --git a/infra/controllers/longhorn.yaml b/infra/controllers/longhorn.yaml
index a23ba04..502214e 100644
--- a/infra/controllers/longhorn.yaml
+++ b/infra/controllers/longhorn.yaml
@@ -1,9 +1,4 @@
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: longhorn-system
----
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
diff --git a/infra/controllers/metallb.yaml b/infra/controllers/metallb.yaml
index 4e075ba..f380093 100644
--- a/infra/controllers/metallb.yaml
+++ b/infra/controllers/metallb.yaml
@@ -1,9 +1,4 @@
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: metallb-system
----
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
diff --git a/infra/controllers/traefik.yaml b/infra/controllers/traefik.yaml
index 08c0f4a..c52bfbb 100644
--- a/infra/controllers/traefik.yaml
+++ b/infra/controllers/traefik.yaml
@@ -1,9 +1,4 @@
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: traefik-system
----
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
diff --git a/infra/namespaces/namespaces.yaml b/infra/namespaces/namespaces.yaml
new file mode 100644
index 0000000..bbf588c
--- /dev/null
+++ b/infra/namespaces/namespaces.yaml
@@ -0,0 +1,25 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: traefik-system
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: metallb-system
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: longhorn-system
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: external-dns-system
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: 1password-system