diff --git a/clustertool/embed/generic/kubernetes/flux-system/flux/namespace.yaml b/clustertool/embed/generic/kubernetes/flux-system/flux/namespace.yaml
index 2bece064051..58cce40cb6c 100644
--- a/clustertool/embed/generic/kubernetes/flux-system/flux/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/flux-system/flux/namespace.yaml
@@ -2,6 +2,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-    name: flux-system
-    labels:
-        pod-security.kubernetes.io/enforce: privileged
+  name: flux-system
+  labels:
+    pod-security.kubernetes.io/enforce: privileged
diff --git a/clustertool/embed/generic/kubernetes/kube-system/descheduler/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/kube-system/descheduler/app/helm-release.yaml
index 8a5b026eab5..32cded9aa74 100644
--- a/clustertool/embed/generic/kubernetes/kube-system/descheduler/app/helm-release.yaml
+++ b/clustertool/embed/generic/kubernetes/kube-system/descheduler/app/helm-release.yaml
@@ -6,14 +6,14 @@ metadata:
 spec:
   interval: 15m
   chart:
-      spec:
-        chart: descheduler
-        version: 0.32.2
-        sourceRef:
-          kind: HelmRepository
-          name: home-ops-mirror
-          namespace: flux-system
-        interval: 15m
+    spec:
+      chart: descheduler
+      version: 0.32.2
+      sourceRef:
+        kind: HelmRepository
+        name: home-ops-mirror
+        namespace: flux-system
+      interval: 15m
   timeout: 20m
   maxHistory: 3
   install:
diff --git a/clustertool/embed/generic/kubernetes/networking/nginx-external/app/namespace.yaml b/clustertool/embed/generic/kubernetes/networking/nginx-external/app/namespace.yaml
index 773ffc61116..f57284de793 100644
--- a/clustertool/embed/generic/kubernetes/networking/nginx-external/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/networking/nginx-external/app/namespace.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-    name: nginx-external
+  name: nginx-external
diff --git a/clustertool/embed/generic/kubernetes/networking/nginx-internal/app/namespace.yaml b/clustertool/embed/generic/kubernetes/networking/nginx-internal/app/namespace.yaml
index 76b827c546f..4bbb75579fd 100644
--- a/clustertool/embed/generic/kubernetes/networking/nginx-internal/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/networking/nginx-internal/app/namespace.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-    name: nginx-internal
+  name: nginx-internal
diff --git a/clustertool/embed/generic/kubernetes/system/kube-prometheus-stack/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/kube-prometheus-stack/app/namespace.yaml
index c642bdce479..deae37b1fdc 100644
--- a/clustertool/embed/generic/kubernetes/system/kube-prometheus-stack/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/system/kube-prometheus-stack/app/namespace.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-    name: kube-prometheus-stack
-    labels:
-        pod-security.kubernetes.io/enforce: privileged
+  name: kube-prometheus-stack
+  labels:
+    pod-security.kubernetes.io/enforce: privileged
diff --git a/clustertool/embed/generic/kubernetes/system/system-upgrade-controller/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/system-upgrade-controller/app/namespace.yaml
index 1a1d3c42162..33d67f10fe6 100644
--- a/clustertool/embed/generic/kubernetes/system/system-upgrade-controller/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/system/system-upgrade-controller/app/namespace.yaml
@@ -1,10 +1,9 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-    name: system-upgrade
-    annotations:
-        volsync.backube/privileged-movers: "true"
-    labels:
-        kustomize.toolkit.fluxcd.io/prune: disabled
-        goldilocks.fairwinds.com/enabled: "true"
-        pod-security.kubernetes.io/enforce: privileged
+  name: system-upgrade
+  annotations:
+    volsync.backube/privileged-movers: "true"
+  labels:
+    kustomize.toolkit.fluxcd.io/prune: disabled
+    pod-security.kubernetes.io/enforce: privileged
diff --git a/clustertool/embed/generic/root/repositories/helm/kustomization.yaml b/clustertool/embed/generic/root/repositories/helm/kustomization.yaml
index c846abb60dd..cc383318501 100644
--- a/clustertool/embed/generic/root/repositories/helm/kustomization.yaml
+++ b/clustertool/embed/generic/root/repositories/helm/kustomization.yaml
@@ -1,15 +1,14 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 metadata:
-    name: helm-repos
-    namespace: flux-system
+  name: helm-repos
+  namespace: flux-system
 resources:
   - bjw-s.yaml
   - cloudnative-pg.yaml
   - home-ops-mirror.yaml
   - jetstack.yaml
   - kustomization.yaml
-  - metallb.yaml
   - prometheus-community.yaml
   - spegel.yaml
   - truecharts.yaml
diff --git a/clustertool/embed/generic/root/repositories/helm/metallb.yaml b/clustertool/embed/generic/root/repositories/helm/metallb.yaml
deleted file mode 100644
index b2436d3ecf0..00000000000
--- a/clustertool/embed/generic/root/repositories/helm/metallb.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: metallb
-  namespace: flux-system
-spec:
-  type: oci
-  interval: 10m
-  url: oci://quay.io/metallb/charts
-  timeout: 3m
diff --git a/clustertool/embed/generic/root/truenas_exports/.gitkeep b/clustertool/embed/generic/root/truenas_exports/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000