diff --git a/cluster/apps/kube-tools/goldilocks/helm-release.yaml b/cluster/apps/kube-tools/goldilocks/helm-release.yaml
deleted file mode 100644
index fb99d29bf..000000000
--- a/cluster/apps/kube-tools/goldilocks/helm-release.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: goldilocks
-  namespace: default
-spec:
-  interval: 15m
-  chart:
-    spec:
-      chart: goldilocks
-      version: 6.3.2
-      sourceRef:
-        kind: HelmRepository
-        name: fairwinds-charts
-        namespace: flux-system
-  install:
-    createNamespace: true
-    remediation:
-      retries: 5
-  upgrade:
-    remediation:
-      retries: 5
-  values:
-    controller:
-      resources:
-        requests:
-          cpu: 200m
-          memory: 105M
-        limits:
-          cpu: 300m
-          memory: 105M
-    dashboard:
-      replicaCount: 1
-      ingress:
-        enabled: true
-        ingressClassName: "nginx"
-        hosts:
-          - host: &host "goldilocks.${SECRET_CLUSTER_DOMAIN}"
-            paths:
-              - path: /
-                type: Prefix
-        tls:
-          - hosts:
-              - *host
-      resources:
-        requests:
-          cpu: 15m
-          memory: 105M
-        limits:
-          cpu: 100m
-          memory: 105M
diff --git a/cluster/apps/kube-tools/goldilocks/kustomization.yaml b/cluster/apps/kube-tools/goldilocks/kustomization.yaml
deleted file mode 100644
index 2fa2de20c..000000000
--- a/cluster/apps/kube-tools/goldilocks/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - helm-release.yaml
diff --git a/cluster/apps/kube-tools/kustomization.yaml b/cluster/apps/kube-tools/kustomization.yaml
index b6b8ff32d..76b0a87bb 100644
--- a/cluster/apps/kube-tools/kustomization.yaml
+++ b/cluster/apps/kube-tools/kustomization.yaml
@@ -4,7 +4,6 @@ kind: Kustomization
 resources:
   # - coredens-nodecache
   - descheduler
-  # - goldilocks
   - intel-gpu-exporter
   - intel-gpu-plugin
   - kyverno
@@ -13,4 +12,3 @@ resources:
   - rbac
   - reloader
   - system-upgrade
-  - vpa
diff --git a/cluster/apps/kube-tools/vpa/helm-release.yaml b/cluster/apps/kube-tools/vpa/helm-release.yaml
deleted file mode 100644
index 65946d375..000000000
--- a/cluster/apps/kube-tools/vpa/helm-release.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: vpa
-  namespace: default
-spec:
-  interval: 15m
-  chart:
-    spec:
-      chart: vpa
-      version: 1.5.0
-      sourceRef:
-        kind: HelmRepository
-        name: fairwinds-charts
-        namespace: flux-system
-  install:
-    createNamespace: true
-    remediation:
-      retries: 5
-  upgrade:
-    remediation:
-      retries: 5
-  values:
-    recommender:
-      enabled: true
-      extraArgs:
-        storage: prometheus
-        prometheus-address: |-
-          http://thanos-query.monitoring.svc.cluster.local.:9090
-    updater:
-      enabled: false
-    admissionController:
-      enabled: false
diff --git a/cluster/apps/kube-tools/vpa/kustomization.yaml b/cluster/apps/kube-tools/vpa/kustomization.yaml
deleted file mode 100644
index 2fa2de20c..000000000
--- a/cluster/apps/kube-tools/vpa/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - helm-release.yaml
diff --git a/cluster/apps/namespaces.yaml b/cluster/apps/namespaces.yaml
index 45bab7f25..dfdefca4f 100644
--- a/cluster/apps/namespaces.yaml
+++ b/cluster/apps/namespaces.yaml
@@ -5,7 +5,6 @@ metadata:
   name: calico-system
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
-    goldilocks.fairwinds.com/enabled: "true"
 ---
 apiVersion: v1
 kind: Namespace
@@ -13,7 +12,6 @@ metadata:
   name: default
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
-    goldilocks.fairwinds.com/enabled: "true"
 ---
 apiVersion: v1
 kind: Namespace
@@ -21,7 +19,6 @@ metadata:
   name: flux-system
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
-    goldilocks.fairwinds.com/enabled: "true"
 ---
 apiVersion: v1
 kind: Namespace
@@ -29,7 +26,6 @@ metadata:
   name: kube-system
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
-    goldilocks.fairwinds.com/enabled: "true"
 ---
 apiVersion: v1
 kind: Namespace
@@ -37,7 +33,6 @@ metadata:
   name: kyverno
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
-    goldilocks.fairwinds.com/enabled: "true"
 ---
 apiVersion: v1
 kind: Namespace
@@ -45,7 +40,6 @@ metadata:
   name: monitoring
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
-    goldilocks.fairwinds.com/enabled: "true"
 ---
 apiVersion: v1
 kind: Namespace
@@ -53,7 +47,6 @@ metadata:
   name: system-upgrade
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
-    goldilocks.fairwinds.com/enabled: "true"
 ---
 apiVersion: v1
 kind: Namespace
@@ -61,4 +54,3 @@ metadata:
   name: tigera-operator
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
-    goldilocks.fairwinds.com/enabled: "true"
diff --git a/cluster/charts/fairwinds-charts.yaml b/cluster/charts/fairwinds-charts.yaml
deleted file mode 100644
index 2daab4251..000000000
--- a/cluster/charts/fairwinds-charts.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
-metadata:
-  name: fairwinds-charts
-  namespace: flux-system
-spec:
-  interval: 1h
-  url: https://charts.fairwinds.com/stable
diff --git a/cluster/charts/kustomization.yaml b/cluster/charts/kustomization.yaml
index fe832832b..cfabb8ef8 100644
--- a/cluster/charts/kustomization.yaml
+++ b/cluster/charts/kustomization.yaml
@@ -10,7 +10,6 @@ resources:
   - dysnix-charts.yaml
   - emxq-charts.yaml
   - external-dns-charts.yaml
-  - fairwinds-charts.yaml
   - gitea-charts.yaml
   - grafana-charts.yaml
   - ingress-nginx-charts.yaml