diff --git a/cluster/base/core.yaml b/cluster/base/core.yaml
new file mode 100644
index 0000000..17c7870
--- /dev/null
+++ b/cluster/base/core.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: core
+  namespace: flux-system
+spec:
+  interval: 10m0s
+  dependsOn:
+    - name: crds
+  path: ./cluster/core
+  prune: false
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
diff --git a/cluster/base/crds.yaml b/cluster/base/crds.yaml
new file mode 100644
index 0000000..c938c9b
--- /dev/null
+++ b/cluster/base/crds.yaml
@@ -0,0 +1,13 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: crds
+  namespace: flux-system
+spec:
+  interval: 10m0s
+  path: ./cluster/crds
+  prune: false
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
diff --git a/cluster/flux-system/charts/helm/kustomization.yaml b/cluster/base/flux-system/charts/helm/kustomization.yaml
similarity index 100%
rename from cluster/flux-system/charts/helm/kustomization.yaml
rename to cluster/base/flux-system/charts/helm/kustomization.yaml
diff --git a/cluster/flux-system/charts/helm/metallb-charts.yaml b/cluster/base/flux-system/charts/helm/metallb-charts.yaml
similarity index 100%
rename from cluster/flux-system/charts/helm/metallb-charts.yaml
rename to cluster/base/flux-system/charts/helm/metallb-charts.yaml
diff --git a/cluster/flux-system/charts/kustomization.yaml b/cluster/base/flux-system/charts/kustomization.yaml
similarity index 100%
rename from cluster/flux-system/charts/kustomization.yaml
rename to cluster/base/flux-system/charts/kustomization.yaml
diff --git a/cluster/flux-system/gotk-components.yaml b/cluster/base/flux-system/gotk-components.yaml
similarity index 100%
rename from cluster/flux-system/gotk-components.yaml
rename to cluster/base/flux-system/gotk-components.yaml
diff --git a/cluster/flux-system/gotk-sync.yaml b/cluster/base/flux-system/gotk-sync.yaml
similarity index 100%
rename from cluster/flux-system/gotk-sync.yaml
rename to cluster/base/flux-system/gotk-sync.yaml
diff --git a/cluster/flux-system/kustomization.yaml b/cluster/base/flux-system/kustomization.yaml
similarity index 100%
rename from cluster/flux-system/kustomization.yaml
rename to cluster/base/flux-system/kustomization.yaml
diff --git a/cluster/crds/kustomization.yaml b/cluster/crds/kustomization.yaml
new file mode 100644
index 0000000..b83b23e
--- /dev/null
+++ b/cluster/crds/kustomization.yaml
@@ -0,0 +1,3 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources: []