diff --git a/charts/kube-prometheus-stack/my-values/values-prod.yaml b/charts/kube-prometheus-stack/my-values/values-prod.yaml
index ce16078..ff1f48d 100644
--- a/charts/kube-prometheus-stack/my-values/values-prod.yaml
+++ b/charts/kube-prometheus-stack/my-values/values-prod.yaml
@@ -1,16 +1,73 @@
-alertmanager:
-  enabled: false
-
-grafana:
-  enabled: false
-
+# ------------------------
+# Disable CRDs and operator
+# ------------------------
 prometheusOperator:
   enabled: false
   createCustomResource: false
 
+# ------------------------
+# Disable Grafana / Alertmanager / Exporters
+# ------------------------
+grafana:
+  enabled: false
+
+alertmanager:
+  enabled: false
+
+kube-state-metrics:
+  enabled: false
+
+prometheus-node-exporter:
+  enabled: false
+
+thanosRuler:
+  enabled: false
+
+# ------------------------
+# Disable all subcharts that touch kube-system
+# ------------------------
+defaultRules:
+  create: false
+
+nodeExporter:
+  enabled: false
+
+kubeEtcd:
+  enabled: false
+
+kubeControllerManager:
+  enabled: false
+
+kubeScheduler:
+  enabled: false
+
+kubeProxy:
+  enabled: false
+
+kubeStateMetrics:
+  enabled: false
+
+kubelet:
+  enabled: false
+
+coreDns:
+  enabled: false
+
+# ------------------------
+# Prometheus instance only
+# ------------------------
 prometheus:
   enabled: true
-
+  prometheusSpec:
+    additionalScrapeConfigsSecret:
+      name: prometheus-additional-scrape-configs
+      key: additional-scrape-configs.yaml
+    enableAdminAPI: true
+    serviceMonitorSelectorNilUsesHelmValues: false
+    podMonitorSelectorNilUsesHelmValues: false
+    ruleSelectorNilUsesHelmValues: false
+  service:
+    type: ClusterIP
   ingress:
     enabled: true
     ingressClassName: traefik
@@ -20,19 +77,3 @@ prometheus:
     hosts:
       - prometheus.dvirlabs.com
     tls: []
-
-  service:
-    type: ClusterIP
-    port: 80
-
-  retention: "15d"
-
-  prometheusSpec:
-    additionalScrapeConfigsSecret:
-      name: prometheus-additional-scrape-configs
-      key: additional-scrape-configs.yaml
-    enableAdminAPI: true
-
-    serviceMonitorSelectorNilUsesHelmValues: false
-    podMonitorSelectorNilUsesHelmValues: false
-    ruleSelectorNilUsesHelmValues: false