diff --git a/kubernetes/apps/kube-system/kubelet-csr-approver/app/helm-values.yml b/kubernetes/apps/kube-system/kubelet-csr-approver/app/helm-values.yml
index 3f0f0089..48ff3763 100644
--- a/kubernetes/apps/kube-system/kubelet-csr-approver/app/helm-values.yml
+++ b/kubernetes/apps/kube-system/kubelet-csr-approver/app/helm-values.yml
@@ -1,2 +1,2 @@
 ---
-providerRegex: ^bilbo|^frodo|^sam|^merry|^pippin|^rosie|^gandalf-01$
+providerRegex: ^bilbo|^frodo|^sam|^merry|^pippin|^rosie$
diff --git a/kubernetes/apps/observability/smartctl-exporter/app/helmrelease.yaml b/kubernetes/apps/observability/smartctl-exporter/app/helmrelease.yaml
index b6ea85c7..2bf1d41a 100644
--- a/kubernetes/apps/observability/smartctl-exporter/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/smartctl-exporter/app/helmrelease.yaml
@@ -18,17 +18,6 @@ spec:
     controllers:
       smartctl-exporter:
         type: daemonset
-        pod:
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                  - matchExpressions:
-                      - key: kubernetes.io/hostname
-                        operator: NotIn
-                        values:
-                          - gandalf-01
-                          - shadowfax-01
         containers:
           app:
             image: &image
@@ -51,43 +40,12 @@ spec:
                     port: &port 9633
                     path: /
               readiness: *probes
-      smartctl-exporter-vms:
-        type: daemonset
-        pod:
-          affinity:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                  - matchExpressions:
-                      - key: kubernetes.io/hostname
-                        operator: In
-                        values:
-                          - gandalf-01
-                          - shadowfax-01
-        containers:
-          app:
-            image: *image
-            args:
-              - --smartctl.path=/usr/sbin/smartctl
-              - --smartctl.interval=120s
-              - --web.listen-address=0.0.0.0:9633
-              - --web.telemetry-path=/metrics
-              - --smartctl.device=/dev/nvme0
-            securityContext: *securityContext
-            probes:
-              liveness: *probes
-              readiness: *probes
     service:
       smartctl-exporter:
         controller: smartctl-exporter
         ports:
           exporter:
             port: *port
-      smartctl-exporter-vms:
-        controller: smartctl-exporter-vms
-        ports:
-          exporter:
-            port: *port
     persistence:
       dev:
         type: hostPath
@@ -105,15 +63,3 @@ spec:
             path: /metrics
             interval: 1m
             scrapeTimeout: 10s
-      smartctl-exporter-vms:
-        selector:
-          matchLabels:
-            app.kubernetes.io/instance: smartctl-exporter
-            app.kubernetes.io/name: smartctl-exporter
-            app.kubernetes.io/service: smartctl-exporter-smartctl-exporter-vms
-        endpoints:
-          - port: exporter
-            scheme: http
-            path: /metrics
-            interval: 1m
-            scrapeTimeout: 10s
diff --git a/kubernetes/apps/observability/victoria-metrics/cluster/kustomization.yaml b/kubernetes/apps/observability/victoria-metrics/cluster/kustomization.yaml
index 771ceed4..81f47a72 100644
--- a/kubernetes/apps/observability/victoria-metrics/cluster/kustomization.yaml
+++ b/kubernetes/apps/observability/victoria-metrics/cluster/kustomization.yaml
@@ -5,5 +5,4 @@ kind: Kustomization
 resources:
   - vmagent.yaml
   - vmalert.yaml
-  - vmscrapeconfig.yaml
   - vmsingle.yaml
diff --git a/kubernetes/apps/observability/victoria-metrics/cluster/vmscrapeconfig.yaml b/kubernetes/apps/observability/victoria-metrics/cluster/vmscrapeconfig.yaml
deleted file mode 100644
index 16fadb5d..00000000
--- a/kubernetes/apps/observability/victoria-metrics/cluster/vmscrapeconfig.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-# yaml-language-server: $schema=https://ks.hsn.dev/operator.victoriametrics.com/vmscrapeconfig_v1beta1.json
-apiVersion: operator.victoriametrics.com/v1beta1
-kind: VMScrapeConfig
-metadata:
-  name: &name zfs-exporter
-spec:
-  staticConfigs:
-    - targets:
-        - "shadowfax.jahanson.tech:9134"
-        - "gandalf.jahanson.tech:9134"
-  path: /metrics
-  relabelConfigs:
-    - action: replace
-      targetLabel: job
-      replacement: *name