diff --git a/cluster/base/infra/1password.yaml b/cluster/base/infra/1password.yaml
index 77eceda..7012534 100644
--- a/cluster/base/infra/1password.yaml
+++ b/cluster/base/infra/1password.yaml
@@ -7,8 +7,6 @@ metadata:
 spec:
   interval: 1h0m0s
   path: ./infra/controllers/1password
-  dependsOn:
-  - name: infra-metallb-config
   prune: true
   retryInterval: 1m0s
   sourceRef:
diff --git a/cluster/base/infra/cert-manager.yaml b/cluster/base/infra/cert-manager.yaml
index 4a172f1..0de9489 100644
--- a/cluster/base/infra/cert-manager.yaml
+++ b/cluster/base/infra/cert-manager.yaml
@@ -7,8 +7,6 @@ metadata:
 spec:
   interval: 1h0m0s
   path: ./infra/controllers/cert-manager
-  dependsOn:
-  - name: infra-namespaces
   prune: true
   retryInterval: 1m0s
   sourceRef:
diff --git a/cluster/base/infra/metallb.yaml b/cluster/base/infra/metallb.yaml
index d635d57..4e85adf 100644
--- a/cluster/base/infra/metallb.yaml
+++ b/cluster/base/infra/metallb.yaml
@@ -7,8 +7,6 @@ metadata:
 spec:
   interval: 1h0m0s
   path: ./infra/controllers/metallb
-  dependsOn:
-  - name: infra-namespaces
   prune: true
   retryInterval: 1m0s
   sourceRef:
diff --git a/cluster/base/infra/namespaces.yaml b/cluster/base/infra/namespaces.yaml
index 4c456c5..b565110 100644
--- a/cluster/base/infra/namespaces.yaml
+++ b/cluster/base/infra/namespaces.yaml
@@ -1,16 +1,40 @@
 ---
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
+apiVersion: v1
+kind: Namespace
 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
+  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
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cert-manager-system
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cert-manager-certs
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: reflector-system
diff --git a/cluster/base/infra/reflector.yaml b/cluster/base/infra/reflector.yaml
index e72bb00..d3ea5b5 100644
--- a/cluster/base/infra/reflector.yaml
+++ b/cluster/base/infra/reflector.yaml
@@ -7,8 +7,6 @@ metadata:
 spec:
   interval: 1h0m0s
   path: ./infra/controllers/reflector
-  dependsOn:
-  - name: infra-metallb-config
   prune: true
   retryInterval: 1m0s
   sourceRef:
diff --git a/infra/controllers/traefik/traefik.yaml b/infra/controllers/traefik/traefik.yaml
index 31dfba8..427fbc7 100644
--- a/infra/controllers/traefik/traefik.yaml
+++ b/infra/controllers/traefik/traefik.yaml
@@ -45,7 +45,7 @@ metadata:
   namespace: traefik-system
   annotations:
     metallb.universe.tf/address-pool: premhome-gc1
-    external-dns.alpha.kubernetes.io/hostname: "*.yadunut.dev"
+    external-dns.alpha.kubernetes.io/hostname: "*.yadunut.dev,yadunut.dev"
 spec:
   type: LoadBalancer
   ports:
diff --git a/infra/namespaces/namespaces.yaml b/infra/namespaces/namespaces.yaml
deleted file mode 100644
index b565110..0000000
--- a/infra/namespaces/namespaces.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-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
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: cert-manager-system
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: cert-manager-certs
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: reflector-system