diff --git a/kubernetes/infrastructure/cilium/app/release.yaml b/kubernetes/infrastructure/cilium/app/release.yaml
index d7fa57d..8be73c8 100644
--- a/kubernetes/infrastructure/cilium/app/release.yaml
+++ b/kubernetes/infrastructure/cilium/app/release.yaml
@@ -2,7 +2,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: cilium
-  namespace: cilium
+  namespace: kube-system
 spec:
   chart:
     spec:
@@ -10,7 +10,7 @@ spec:
       version: 1.15.5
       sourceRef:
         kind: HelmRepository
-        namespace: cilium
+        namespace: kube-system
         name: cilium
   install:
     crds: Create
diff --git a/kubernetes/infrastructure/cilium/cilium.yaml b/kubernetes/infrastructure/cilium/cilium.yaml
index 368a552..f68b6d1 100644
--- a/kubernetes/infrastructure/cilium/cilium.yaml
+++ b/kubernetes/infrastructure/cilium/cilium.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
  name: cilium
- namespace: cilium
+ namespace: kube-system
 spec:
  interval: 10m
  timeout: 1m30s
@@ -18,7 +18,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: cilium-networkpolicies
-  namespace: cilium
+  namespace: kube-system
 spec:
   suspend: false
   interval: 10m
diff --git a/kubernetes/infrastructure/cilium/networkpolicies/coredns.yaml b/kubernetes/infrastructure/cilium/networkpolicies/coredns.yaml
index bf95260..5b7826c 100644
--- a/kubernetes/infrastructure/cilium/networkpolicies/coredns.yaml
+++ b/kubernetes/infrastructure/cilium/networkpolicies/coredns.yaml
@@ -2,7 +2,7 @@ apiVersion: cilium.io/v2
 kind: CiliumNetworkPolicy
 metadata:
   name: coredns
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
diff --git a/kubernetes/infrastructure/cilium/networkpolicies/egress-kube-dns.yaml b/kubernetes/infrastructure/cilium/networkpolicies/egress-kube-dns.yaml
index dc0ac94..419a3df 100644
--- a/kubernetes/infrastructure/cilium/networkpolicies/egress-kube-dns.yaml
+++ b/kubernetes/infrastructure/cilium/networkpolicies/egress-kube-dns.yaml
@@ -2,7 +2,7 @@ apiVersion: cilium.io/v2
 kind: CiliumClusterwideNetworkPolicy
 metadata:
   name: egress-kube-dns
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchExpressions:
diff --git a/kubernetes/infrastructure/cilium/networkpolicies/egress-kubeapi.yaml b/kubernetes/infrastructure/cilium/networkpolicies/egress-kubeapi.yaml
index 74fbe0b..97be096 100644
--- a/kubernetes/infrastructure/cilium/networkpolicies/egress-kubeapi.yaml
+++ b/kubernetes/infrastructure/cilium/networkpolicies/egress-kubeapi.yaml
@@ -2,7 +2,7 @@ apiVersion: cilium.io/v2
 kind: CiliumClusterwideNetworkPolicy
 metadata:
   name: egress-kubeapi
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
diff --git a/kubernetes/infrastructure/cilium/networkpolicies/egress-namespace.yaml b/kubernetes/infrastructure/cilium/networkpolicies/egress-namespace.yaml
index 12062cf..b4a7b3c 100644
--- a/kubernetes/infrastructure/cilium/networkpolicies/egress-namespace.yaml
+++ b/kubernetes/infrastructure/cilium/networkpolicies/egress-namespace.yaml
@@ -2,7 +2,7 @@ apiVersion: cilium.io/v2
 kind: CiliumClusterwideNetworkPolicy
 metadata:
   name: egress-namespace
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
diff --git a/kubernetes/infrastructure/cilium/networkpolicies/egress-nodes.yaml b/kubernetes/infrastructure/cilium/networkpolicies/egress-nodes.yaml
index 338c8c6..c29203d 100644
--- a/kubernetes/infrastructure/cilium/networkpolicies/egress-nodes.yaml
+++ b/kubernetes/infrastructure/cilium/networkpolicies/egress-nodes.yaml
@@ -2,7 +2,7 @@ apiVersion: cilium.io/v2
 kind: CiliumClusterwideNetworkPolicy
 metadata:
   name: egress-nodes
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
diff --git a/kubernetes/infrastructure/cilium/networkpolicies/egress-world.yaml b/kubernetes/infrastructure/cilium/networkpolicies/egress-world.yaml
index 03fe0ff..8bf9fec 100644
--- a/kubernetes/infrastructure/cilium/networkpolicies/egress-world.yaml
+++ b/kubernetes/infrastructure/cilium/networkpolicies/egress-world.yaml
@@ -2,7 +2,7 @@ apiVersion: cilium.io/v2
 kind: CiliumClusterwideNetworkPolicy
 metadata:
   name: egress-world
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
diff --git a/kubernetes/infrastructure/cilium/networkpolicies/ingress-namespace.yaml b/kubernetes/infrastructure/cilium/networkpolicies/ingress-namespace.yaml
index 8afb146..6922846 100644
--- a/kubernetes/infrastructure/cilium/networkpolicies/ingress-namespace.yaml
+++ b/kubernetes/infrastructure/cilium/networkpolicies/ingress-namespace.yaml
@@ -2,7 +2,7 @@ apiVersion: cilium.io/v2
 kind: CiliumClusterwideNetworkPolicy
 metadata:
   name: ingress-namespace
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
diff --git a/kubernetes/infrastructure/cilium/networkpolicies/ingress-nginx.yaml b/kubernetes/infrastructure/cilium/networkpolicies/ingress-nginx.yaml
index 2b93142..623d1a0 100644
--- a/kubernetes/infrastructure/cilium/networkpolicies/ingress-nginx.yaml
+++ b/kubernetes/infrastructure/cilium/networkpolicies/ingress-nginx.yaml
@@ -2,7 +2,7 @@ apiVersion: cilium.io/v2
 kind: CiliumClusterwideNetworkPolicy
 metadata:
   name: ingress-ingress
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
@@ -18,7 +18,7 @@ apiVersion: cilium.io/v2
 kind: CiliumNetworkPolicy
 metadata:
   name: ingress-nginx
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
@@ -36,7 +36,7 @@ apiVersion: cilium.io/v2
 kind: CiliumClusterwideNetworkPolicy
 metadata:
   name: egress-ingress
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
@@ -52,7 +52,7 @@ apiVersion: cilium.io/v2
 kind: CiliumNetworkPolicy
 metadata:
   name: egress-nginx
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
diff --git a/kubernetes/infrastructure/cilium/networkpolicies/ingress-nodes.yaml b/kubernetes/infrastructure/cilium/networkpolicies/ingress-nodes.yaml
index 1e69a20..88ad767 100644
--- a/kubernetes/infrastructure/cilium/networkpolicies/ingress-nodes.yaml
+++ b/kubernetes/infrastructure/cilium/networkpolicies/ingress-nodes.yaml
@@ -2,7 +2,7 @@ apiVersion: cilium.io/v2
 kind: CiliumClusterwideNetworkPolicy
 metadata:
   name: ingress-nodes
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
diff --git a/kubernetes/infrastructure/cilium/networkpolicies/ingress-world.yaml b/kubernetes/infrastructure/cilium/networkpolicies/ingress-world.yaml
index 1c3f6ed..6445ffe 100644
--- a/kubernetes/infrastructure/cilium/networkpolicies/ingress-world.yaml
+++ b/kubernetes/infrastructure/cilium/networkpolicies/ingress-world.yaml
@@ -2,7 +2,7 @@ apiVersion: cilium.io/v2
 kind: CiliumClusterwideNetworkPolicy
 metadata:
   name: ingress-world
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
diff --git a/kubernetes/infrastructure/cilium/networkpolicies/local-path-provisioner.yaml b/kubernetes/infrastructure/cilium/networkpolicies/local-path-provisioner.yaml
index 8416a9e..947aff1 100644
--- a/kubernetes/infrastructure/cilium/networkpolicies/local-path-provisioner.yaml
+++ b/kubernetes/infrastructure/cilium/networkpolicies/local-path-provisioner.yaml
@@ -2,7 +2,7 @@ apiVersion: cilium.io/v2
 kind: CiliumNetworkPolicy
 metadata:
   name: local-path-provisioner
-  namespace: cilium
+  namespace: kube-system
 spec:
   endpointSelector:
     matchLabels:
diff --git a/kubernetes/infrastructure/cilium/app/repository.yaml b/kubernetes/infrastructure/repositories/repos/cilium.yaml
similarity index 84%
rename from kubernetes/infrastructure/cilium/app/repository.yaml
rename to kubernetes/infrastructure/repositories/repos/cilium.yaml
index a2caf9b..0ca641c 100644
--- a/kubernetes/infrastructure/cilium/app/repository.yaml
+++ b/kubernetes/infrastructure/repositories/repos/cilium.yaml
@@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: cilium
-  namespace: cilium
+  namespace: kube-system
 spec:
   interval: 1h
   url: https://helm.cilium.io