diff --git a/README.md b/README.md
index c6d090eb..cd60483a 100644
--- a/README.md
+++ b/README.md
@@ -165,7 +165,7 @@ envsubst < ./.sops.yaml
 envsubst < ./cluster/cluster-secrets.yaml
 envsubst < ./cluster/cluster-settings.yaml
 envsubst < ./cluster/base/flux-system/gotk-sync.yaml
-envsubst < ./cluster/core/infrastructure/cert-manager/secret.enc.yaml
+envsubst < ./cluster/core/cert-manager/secret.enc.yaml
 ```
 
 4. **Verify** all the above files have the correct information present
diff --git a/cluster/core/crds/cert-manager/kustomization.yaml b/cluster/core/cert-manager/crd/kustomization.yaml
similarity index 100%
rename from cluster/core/crds/cert-manager/kustomization.yaml
rename to cluster/core/cert-manager/crd/kustomization.yaml
diff --git a/cluster/core/operators/cert-manager/helm-release.yaml b/cluster/core/cert-manager/helm-release.yaml
similarity index 91%
rename from cluster/core/operators/cert-manager/helm-release.yaml
rename to cluster/core/cert-manager/helm-release.yaml
index c4dd62d2..a62b325a 100644
--- a/cluster/core/operators/cert-manager/helm-release.yaml
+++ b/cluster/core/cert-manager/helm-release.yaml
@@ -5,7 +5,6 @@ metadata:
   name: cert-manager
   namespace: cert-manager
 spec:
-  interval: 5m
   chart:
     spec:
       # renovate: registryUrl=https://charts.jetstack.io/
@@ -15,7 +14,6 @@ spec:
         kind: HelmRepository
         name: jetstack-charts
         namespace: flux-system
-      interval: 5m
   values:
     installCRDs: false
     webhook:
@@ -34,4 +32,3 @@ spec:
       enabled: false
       servicemonitor:
         enabled: false
-        prometheusInstance: monitoring
diff --git a/cluster/core/infrastructure/cert-manager/kustomization.yaml b/cluster/core/cert-manager/kustomization.yaml
similarity index 85%
rename from cluster/core/infrastructure/cert-manager/kustomization.yaml
rename to cluster/core/cert-manager/kustomization.yaml
index cf778581..f0c9364e 100644
--- a/cluster/core/infrastructure/cert-manager/kustomization.yaml
+++ b/cluster/core/cert-manager/kustomization.yaml
@@ -1,6 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+- crd
+- helm-release.yaml
 - letsencrypt-production.yaml
 - letsencrypt-staging.yaml
 - secret.enc.yaml
diff --git a/cluster/core/infrastructure/cert-manager/letsencrypt-production.yaml b/cluster/core/cert-manager/letsencrypt-production.yaml
similarity index 100%
rename from cluster/core/infrastructure/cert-manager/letsencrypt-production.yaml
rename to cluster/core/cert-manager/letsencrypt-production.yaml
diff --git a/cluster/core/infrastructure/cert-manager/letsencrypt-staging.yaml b/cluster/core/cert-manager/letsencrypt-staging.yaml
similarity index 100%
rename from cluster/core/infrastructure/cert-manager/letsencrypt-staging.yaml
rename to cluster/core/cert-manager/letsencrypt-staging.yaml
diff --git a/cluster/core/infrastructure/cert-manager/secret.enc.yaml b/cluster/core/cert-manager/secret.enc.yaml
similarity index 100%
rename from cluster/core/infrastructure/cert-manager/secret.enc.yaml
rename to cluster/core/cert-manager/secret.enc.yaml
diff --git a/cluster/core/crds/kustomization.yaml b/cluster/core/crds/kustomization.yaml
deleted file mode 100644
index 75b65cfc..00000000
--- a/cluster/core/crds/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- cert-manager
diff --git a/cluster/core/infrastructure/kustomization.yaml b/cluster/core/infrastructure/kustomization.yaml
deleted file mode 100644
index 749e1da3..00000000
--- a/cluster/core/infrastructure/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- cert-manager
-- metallb
diff --git a/cluster/core/kustomization.yaml b/cluster/core/kustomization.yaml
index 65d46e44..65cbeeb5 100644
--- a/cluster/core/kustomization.yaml
+++ b/cluster/core/kustomization.yaml
@@ -1,7 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- crds
-- infrastructure
 - namespaces
-- operators
+- metallb-system
+- cert-manager
diff --git a/cluster/core/infrastructure/metallb/helm-release.yaml b/cluster/core/metallb-system/helm-release.yaml
similarity index 92%
rename from cluster/core/infrastructure/metallb/helm-release.yaml
rename to cluster/core/metallb-system/helm-release.yaml
index b9266346..683cd94f 100644
--- a/cluster/core/infrastructure/metallb/helm-release.yaml
+++ b/cluster/core/metallb-system/helm-release.yaml
@@ -3,9 +3,8 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: metallb
-  namespace: networking
+  namespace: metallb-system
 spec:
-  interval: 5m
   chart:
     spec:
       chart: metallb
@@ -14,7 +13,6 @@ spec:
         kind: HelmRepository
         name: bitnami-charts
         namespace: flux-system
-      interval: 10m
   values:
     controller:
       image:
diff --git a/cluster/core/infrastructure/metallb/kustomization.yaml b/cluster/core/metallb-system/kustomization.yaml
similarity index 100%
rename from cluster/core/infrastructure/metallb/kustomization.yaml
rename to cluster/core/metallb-system/kustomization.yaml
diff --git a/cluster/core/namespaces/kustomization.yaml b/cluster/core/namespaces/kustomization.yaml
index 8b2d090b..f086345d 100644
--- a/cluster/core/namespaces/kustomization.yaml
+++ b/cluster/core/namespaces/kustomization.yaml
@@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - cert-manager.yaml
-- networking.yaml
+- metallb-system.yaml
diff --git a/cluster/core/namespaces/networking.yaml b/cluster/core/namespaces/metallb-system.yaml
similarity index 66%
rename from cluster/core/namespaces/networking.yaml
rename to cluster/core/namespaces/metallb-system.yaml
index fa9575ea..928cb910 100644
--- a/cluster/core/namespaces/networking.yaml
+++ b/cluster/core/namespaces/metallb-system.yaml
@@ -2,4 +2,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: networking
+  name: metallb-system
diff --git a/cluster/core/operators/cert-manager/kustomization.yaml b/cluster/core/operators/cert-manager/kustomization.yaml
deleted file mode 100644
index 761d2252..00000000
--- a/cluster/core/operators/cert-manager/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- helm-release.yaml
diff --git a/cluster/core/operators/kustomization.yaml b/cluster/core/operators/kustomization.yaml
deleted file mode 100644
index 75b65cfc..00000000
--- a/cluster/core/operators/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- cert-manager