diff --git a/cluster/base/flux-system/charts/banzaicloud-charts.yaml b/cluster/base-custom/charts/banzaicloud-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/banzaicloud-charts.yaml
rename to cluster/base-custom/charts/banzaicloud-charts.yaml
diff --git a/cluster/base/flux-system/charts/bitnami-charts.yaml b/cluster/base-custom/charts/bitnami-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/bitnami-charts.yaml
rename to cluster/base-custom/charts/bitnami-charts.yaml
diff --git a/cluster/base/flux-system/charts/cert-manager-webhook-ovh.yaml b/cluster/base-custom/charts/cert-manager-webhook-ovh.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/cert-manager-webhook-ovh.yaml
rename to cluster/base-custom/charts/cert-manager-webhook-ovh.yaml
diff --git a/cluster/base/flux-system/charts/coredns-charts.yaml b/cluster/base-custom/charts/coredns-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/coredns-charts.yaml
rename to cluster/base-custom/charts/coredns-charts.yaml
diff --git a/cluster/base/flux-system/charts/drone-charts.yaml b/cluster/base-custom/charts/drone-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/drone-charts.yaml
rename to cluster/base-custom/charts/drone-charts.yaml
diff --git a/cluster/base/flux-system/charts/fairwinds-charts.yaml b/cluster/base-custom/charts/fairwinds-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/fairwinds-charts.yaml
rename to cluster/base-custom/charts/fairwinds-charts.yaml
diff --git a/cluster/base/flux-system/charts/falco-security-charts.yaml b/cluster/base-custom/charts/falco-security-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/falco-security-charts.yaml
rename to cluster/base-custom/charts/falco-security-charts.yaml
diff --git a/cluster/base/flux-system/charts/gitea-charts.yaml b/cluster/base-custom/charts/gitea-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/gitea-charts.yaml
rename to cluster/base-custom/charts/gitea-charts.yaml
diff --git a/cluster/base/flux-system/charts/grafana-loki-charts.yaml b/cluster/base-custom/charts/grafana-loki-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/grafana-loki-charts.yaml
rename to cluster/base-custom/charts/grafana-loki-charts.yaml
diff --git a/cluster/base/flux-system/charts/influxdata-charts.yaml b/cluster/base-custom/charts/influxdata-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/influxdata-charts.yaml
rename to cluster/base-custom/charts/influxdata-charts.yaml
diff --git a/cluster/base/flux-system/charts/infracloudio-charts.yaml b/cluster/base-custom/charts/infracloudio-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/infracloudio-charts.yaml
rename to cluster/base-custom/charts/infracloudio-charts.yaml
diff --git a/cluster/base/flux-system/charts/ingress-nginx-charts.yaml b/cluster/base-custom/charts/ingress-nginx-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/ingress-nginx-charts.yaml
rename to cluster/base-custom/charts/ingress-nginx-charts.yaml
diff --git a/cluster/base/flux-system/charts/jetstack-charts.yaml b/cluster/base-custom/charts/jetstack-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/jetstack-charts.yaml
rename to cluster/base-custom/charts/jetstack-charts.yaml
diff --git a/cluster/base/flux-system/charts/k8s-at-home.yaml b/cluster/base-custom/charts/k8s-at-home.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/k8s-at-home.yaml
rename to cluster/base-custom/charts/k8s-at-home.yaml
diff --git a/cluster/base/flux-system/charts/kasten-charts.yaml b/cluster/base-custom/charts/kasten-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/kasten-charts.yaml
rename to cluster/base-custom/charts/kasten-charts.yaml
diff --git a/cluster/base/flux-system/charts/kubernetes-dashboard-charts.yaml b/cluster/base-custom/charts/kubernetes-dashboard-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/kubernetes-dashboard-charts.yaml
rename to cluster/base-custom/charts/kubernetes-dashboard-charts.yaml
diff --git a/cluster/base/flux-system/charts/kubernetes-sigs-descheduler-charts.yaml b/cluster/base-custom/charts/kubernetes-sigs-descheduler-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/kubernetes-sigs-descheduler-charts.yaml
rename to cluster/base-custom/charts/kubernetes-sigs-descheduler-charts.yaml
diff --git a/cluster/base/flux-system/charts/kustomization.yaml b/cluster/base-custom/charts/kustomization.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/kustomization.yaml
rename to cluster/base-custom/charts/kustomization.yaml
diff --git a/cluster/base/flux-system/charts/nicholaswilde.yaml b/cluster/base-custom/charts/nicholaswilde.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/nicholaswilde.yaml
rename to cluster/base-custom/charts/nicholaswilde.yaml
diff --git a/cluster/base/flux-system/charts/node-feature-discovery.yaml b/cluster/base-custom/charts/node-feature-discovery.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/node-feature-discovery.yaml
rename to cluster/base-custom/charts/node-feature-discovery.yaml
diff --git a/cluster/base/flux-system/charts/prometheus-community-charts.yaml b/cluster/base-custom/charts/prometheus-community-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/prometheus-community-charts.yaml
rename to cluster/base-custom/charts/prometheus-community-charts.yaml
diff --git a/cluster/base/flux-system/charts/rook-ceph-charts.yaml b/cluster/base-custom/charts/rook-ceph-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/rook-ceph-charts.yaml
rename to cluster/base-custom/charts/rook-ceph-charts.yaml
diff --git a/cluster/base/flux-system/charts/runix-charts.yaml b/cluster/base-custom/charts/runix-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/runix-charts.yaml
rename to cluster/base-custom/charts/runix-charts.yaml
diff --git a/cluster/base/flux-system/charts/stakater-charts.yaml b/cluster/base-custom/charts/stakater-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/stakater-charts.yaml
rename to cluster/base-custom/charts/stakater-charts.yaml
diff --git a/cluster/base/flux-system/charts/twuni-charts.yaml b/cluster/base-custom/charts/twuni-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/twuni-charts.yaml
rename to cluster/base-custom/charts/twuni-charts.yaml
diff --git a/cluster/base/flux-system/charts/vernemq-charts.yaml b/cluster/base-custom/charts/vernemq-charts.yaml
similarity index 100%
rename from cluster/base/flux-system/charts/vernemq-charts.yaml
rename to cluster/base-custom/charts/vernemq-charts.yaml
diff --git a/cluster/base-custom/kustomization.yaml b/cluster/base-custom/kustomization.yaml
index 726d595f8..03b2104f9 100644
--- a/cluster/base-custom/kustomization.yaml
+++ b/cluster/base-custom/kustomization.yaml
@@ -1,6 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+  - charts
   - crds
   - secrets
   - settings
diff --git a/cluster/base/flux-system/kustomization.yaml b/cluster/base/flux-system/kustomization.yaml
index 3b407e729..152bb9294 100644
--- a/cluster/base/flux-system/kustomization.yaml
+++ b/cluster/base/flux-system/kustomization.yaml
@@ -3,4 +3,3 @@ kind: Kustomization
 resources:
   - gotk-components.yaml
   - gotk-sync.yaml
-  - charts