diff --git a/kubernetes/kyak/apps/tools/descheduler/app/helmrelease.yaml b/kubernetes/kyak/apps/kube-system/descheduler/app/helmrelease.yaml
similarity index 97%
rename from kubernetes/kyak/apps/tools/descheduler/app/helmrelease.yaml
rename to kubernetes/kyak/apps/kube-system/descheduler/app/helmrelease.yaml
index 7c3d81082d..2719b6c6ab 100644
--- a/kubernetes/kyak/apps/tools/descheduler/app/helmrelease.yaml
+++ b/kubernetes/kyak/apps/kube-system/descheduler/app/helmrelease.yaml
@@ -14,16 +14,14 @@ spec:
         kind: HelmRepository
         name: descheduler
         namespace: flux-system
-  maxHistory: 2
   install:
     remediation:
       retries: 3
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
-  uninstall:
-    keepHistory: false
   values:
     replicas: 2
     kind: Deployment
diff --git a/kubernetes/kyak/apps/tools/descheduler/app/kustomization.yaml b/kubernetes/kyak/apps/kube-system/descheduler/app/kustomization.yaml
similarity index 100%
rename from kubernetes/kyak/apps/tools/descheduler/app/kustomization.yaml
rename to kubernetes/kyak/apps/kube-system/descheduler/app/kustomization.yaml
diff --git a/kubernetes/kyak/apps/tools/descheduler/ks.yaml b/kubernetes/kyak/apps/kube-system/descheduler/ks.yaml
similarity index 83%
rename from kubernetes/kyak/apps/tools/descheduler/ks.yaml
rename to kubernetes/kyak/apps/kube-system/descheduler/ks.yaml
index d407ff5c0e..fb46393196 100644
--- a/kubernetes/kyak/apps/tools/descheduler/ks.yaml
+++ b/kubernetes/kyak/apps/kube-system/descheduler/ks.yaml
@@ -6,11 +6,11 @@ metadata:
   name: &app descheduler
   namespace: flux-system
 spec:
-  targetNamespace: tools
+  targetNamespace: kube-system
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/kyak/apps/tools/descheduler/app
+  path: ./kubernetes/kyak/apps/kube-system/descheduler/app
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/kyak/apps/kube-system/kustomization.yaml b/kubernetes/kyak/apps/kube-system/kustomization.yaml
index bca6d010ce..1bffc6d5af 100644
--- a/kubernetes/kyak/apps/kube-system/kustomization.yaml
+++ b/kubernetes/kyak/apps/kube-system/kustomization.yaml
@@ -9,7 +9,9 @@ resources:
   # Flux-Kustomizations
   - ./cilium/ks.yaml
   - ./coredns/ks.yaml
+  - ./descheduler/ks.yaml
   - ./fstrim/ks.yaml
   - ./kubelet-csr-approver/ks.yaml
   - ./metrics-server/ks.yaml
   - ./node-feature-discovery/ks.yaml
+  - ./reloader/ks.yaml
diff --git a/kubernetes/kyak/apps/kube-system/namespace.yaml b/kubernetes/kyak/apps/kube-system/namespace.yaml
index 865a12e591..57ef524f42 100644
--- a/kubernetes/kyak/apps/kube-system/namespace.yaml
+++ b/kubernetes/kyak/apps/kube-system/namespace.yaml
@@ -5,5 +5,4 @@ metadata:
   name: kube-system
   labels:
     istio.io/dataplane-mode: ambient
-
     kustomize.toolkit.fluxcd.io/prune: disabled
diff --git a/kubernetes/kyak/apps/tools/reloader/app/helmrelease.yaml b/kubernetes/kyak/apps/kube-system/reloader/app/helmrelease.yaml
similarity index 100%
rename from kubernetes/kyak/apps/tools/reloader/app/helmrelease.yaml
rename to kubernetes/kyak/apps/kube-system/reloader/app/helmrelease.yaml
diff --git a/kubernetes/kyak/apps/tools/reloader/app/kustomization.yaml b/kubernetes/kyak/apps/kube-system/reloader/app/kustomization.yaml
similarity index 100%
rename from kubernetes/kyak/apps/tools/reloader/app/kustomization.yaml
rename to kubernetes/kyak/apps/kube-system/reloader/app/kustomization.yaml
diff --git a/kubernetes/kyak/apps/tools/reloader/ks.yaml b/kubernetes/kyak/apps/kube-system/reloader/ks.yaml
similarity index 83%
rename from kubernetes/kyak/apps/tools/reloader/ks.yaml
rename to kubernetes/kyak/apps/kube-system/reloader/ks.yaml
index c60501b72f..f3eb98841a 100644
--- a/kubernetes/kyak/apps/tools/reloader/ks.yaml
+++ b/kubernetes/kyak/apps/kube-system/reloader/ks.yaml
@@ -6,11 +6,11 @@ metadata:
   name: &app reloader
   namespace: flux-system
 spec:
-  targetNamespace: tools
+  targetNamespace: kube-system
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/kyak/apps/tools/reloader/app
+  path: ./kubernetes/kyak/apps/kube-system/reloader/app
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/kyak/apps/monitoring/kromgo/ks.yaml b/kubernetes/kyak/apps/monitoring/kromgo/ks.yaml
index 82845e17e3..af2960b3a9 100644
--- a/kubernetes/kyak/apps/monitoring/kromgo/ks.yaml
+++ b/kubernetes/kyak/apps/monitoring/kromgo/ks.yaml
@@ -22,4 +22,4 @@ spec:
   postBuild:
     substitute:
       APP: *app
-      GATUS_STATUS: "404"
+      GATUS_PATH: /-/ready
diff --git a/kubernetes/kyak/apps/monitoring/smartctl-exporter/app/helmrelease.yaml b/kubernetes/kyak/apps/monitoring/smartctl-exporter/app/helmrelease.yaml
index fbb7dbb3fd..246c8e4457 100644
--- a/kubernetes/kyak/apps/monitoring/smartctl-exporter/app/helmrelease.yaml
+++ b/kubernetes/kyak/apps/monitoring/smartctl-exporter/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta1.json
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
@@ -14,21 +14,24 @@ spec:
         kind: HelmRepository
         name: prometheus-community
         namespace: flux-system
-  maxHistory: 2
   install:
     remediation:
       retries: 3
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
-  uninstall:
-    keepHistory: false
+  dependsOn:
+    - name: kube-prometheus-stack
+      namespace: monitoring
   values:
     fullnameOverride: *app
     config:
       devices:
         - /dev/sda
+        - /dev/sdb
+        - /dev/sdc
         - /dev/nvme0n1
     serviceMonitor:
       enabled: true
diff --git a/kubernetes/kyak/apps/monitoring/smartctl-exporter/app/prometheusrule.yaml b/kubernetes/kyak/apps/monitoring/smartctl-exporter/app/prometheusrule.yaml
index b90cedf566..beaab801fd 100644
--- a/kubernetes/kyak/apps/monitoring/smartctl-exporter/app/prometheusrule.yaml
+++ b/kubernetes/kyak/apps/monitoring/smartctl-exporter/app/prometheusrule.yaml
@@ -38,7 +38,7 @@ spec:
           labels:
             severity: critical
         #
-        # https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-smartctl-exporter/rules/rules.txt
+        # Ref: https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-smartctl-exporter/rules/rules.txt
         #
         - alert: SmartDeviceMediaErrors
           annotations:
diff --git a/kubernetes/kyak/apps/tools/kustomization.yaml b/kubernetes/kyak/apps/tools/kustomization.yaml
deleted file mode 100644
index 73b54d1b9a..0000000000
--- a/kubernetes/kyak/apps/tools/kustomization.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://json.schemastore.org/kustomization
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  # Pre Flux-Kustomizations
-  - ./namespace.yaml
-  # Flux-Kustomizations
-  - ./descheduler/ks.yaml
-  - ./reloader/ks.yaml
diff --git a/kubernetes/kyak/apps/tools/namespace.yaml b/kubernetes/kyak/apps/tools/namespace.yaml
deleted file mode 100644
index 201057760f..0000000000
--- a/kubernetes/kyak/apps/tools/namespace.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: tools
-  labels:
-    istio.io/dataplane-mode: ambient
-
-    goldilocks.fairwinds.com/enabled: "true"