diff --git a/clusters/cl01tl/monitoring/kube-prometheus-stack/values.yaml b/clusters/cl01tl/monitoring/kube-prometheus-stack/values.yaml
index 10e2909a7..a76f409e5 100644
--- a/clusters/cl01tl/monitoring/kube-prometheus-stack/values.yaml
+++ b/clusters/cl01tl/monitoring/kube-prometheus-stack/values.yaml
@@ -91,66 +91,66 @@ kube-prometheus-stack:
       validatingWebhookConfiguration:
         annotations:
           argocd.argoproj.io/hook: PreSync
-    namespaces:
-      releaseNamespace: true
-      additional:
-        - kube-system
-        - kube-prometheus-stack
-        - argo-workflows
-        - argocd
-        - audiobookshelf
-        - authentik
-        - blocky
-        - cert-manager
-        - cloudnative-pg
-        - descheduler
-        - directus
-        - external-dns
-        - freshrss
-        - gatus
-        - generic-device-plugin
-        - gitea
-        - grafana-operator
-        - harbor
-        - hoarder
-        - home-assistant
-        - immich
-        - jellystat
-        - komodo
-        - lidarr
-        - linkwarden
-        - loki
-        - matrix-synapse
-        - n8n
-        - ntfy
-        - ollama
-        - outline
-        - photoview
-        - postiz
-        - qbittorrent
-        - radarr
-        - radarr-4k
-        - radarr-anime
-        - radarr-standup
-        - reloader
-        - rook-ceph
-        - roundcube
-        - shelly-plug
-        - slskd
-        - sonarr
-        - sonarr-4k
-        - sonarr-anime
-        - speedtest-exporter
-        - spegel
-        - stalwart
-        - tdarr
-        - traefik
-        - trivy
-        - unpoller
-        - vault
-        - vaultwarden
-        - volsync
-        - yamtrack
+    # namespaces:
+    #   releaseNamespace: true
+    #   additional:
+    #     - kube-system
+    #     - kube-prometheus-stack
+    #     - argo-workflows
+    #     - argocd
+    #     - audiobookshelf
+    #     - authentik
+    #     - blocky
+    #     - cert-manager
+    #     - cloudnative-pg
+    #     - descheduler
+    #     - directus
+    #     - external-dns
+    #     - freshrss
+    #     - gatus
+    #     - generic-device-plugin
+    #     - gitea
+    #     - grafana-operator
+    #     - harbor
+    #     - hoarder
+    #     - home-assistant
+    #     - immich
+    #     - jellystat
+    #     - komodo
+    #     - lidarr
+    #     - linkwarden
+    #     - loki
+    #     - matrix-synapse
+    #     - n8n
+    #     - ntfy
+    #     - ollama
+    #     - outline
+    #     - photoview
+    #     - postiz
+    #     - qbittorrent
+    #     - radarr
+    #     - radarr-4k
+    #     - radarr-anime
+    #     - radarr-standup
+    #     - reloader
+    #     - rook-ceph
+    #     - roundcube
+    #     - shelly-plug
+    #     - slskd
+    #     - sonarr
+    #     - sonarr-4k
+    #     - sonarr-anime
+    #     - speedtest-exporter
+    #     - spegel
+    #     - stalwart
+    #     - tdarr
+    #     - traefik
+    #     - trivy
+    #     - unpoller
+    #     - vault
+    #     - vaultwarden
+    #     - volsync
+    #     - yamtrack
   prometheus:
     ingress:
       enabled: false
@@ -159,8 +159,8 @@ kube-prometheus-stack:
       retention: 30d
       externalUrl: https://prometheus.alexlebens.net
       ruleSelectorNilUsesHelmValues: false
-      serviceMonitorSelectorNilUsesHelmValues: false
-      podMonitorSelectorNilUsesHelmValues: false
+      serviceMonitorSelectorNilUsesHelmValues: true
+      podMonitorSelectorNilUsesHelmValues: true
       scrapeConfigSelectorNilUsesHelmValues: false
       storageSpec:
         volumeClaimTemplate: