diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/argocd-apps-kube-prometheus-stack-app.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/argocd-apps-kube-prometheus-stack-app.yaml
index 375269d..193da41 100644
--- a/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/argocd-apps-kube-prometheus-stack-app.yaml
+++ b/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/argocd-apps-kube-prometheus-stack-app.yaml
@@ -68,7 +68,3 @@ spec:
       kind: ServiceMonitor
     - group: '*'
       kind: Prometheus
-  # When using Applications-in-any-namespace, this field determines which namespaces this AppProject permits
-  # Applications to reside in. Details: https://argo-cd.readthedocs.io/en/stable/operator-manual/app-any-namespace/
-  sourceNamespaces:
-    - "kube-system"
diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/values-override.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/values-override.yaml
index b92406f..c7e775e 100644
--- a/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/values-override.yaml
+++ b/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/values-override.yaml
@@ -25,6 +25,17 @@ alertmanager:
 grafana:
   enabled: false
 
+## Component scraping the kubelet and kubelet-hosted cAdvisor
+##
+kubelet:
+  namespace: kube-prometheus-stack
+
+## Manages Prometheus and Alertmanager components
+##
+prometheusOperator:
+  kubeletService:
+    namespace: kube-prometheus-stack
+
 ## Deploy a Prometheus instance
 ##
 prometheus: