diff --git a/helm/README.md b/helm/README.md
index e6a71c622..2293a4822 100644
--- a/helm/README.md
+++ b/helm/README.md
@@ -20,9 +20,12 @@ helm install coreos/kube-prometheus --name kube-prometheus --namespace monitorin
 
 
 ```
+# From top directory i.e. prometheus-operator
 helm install helm/prometheus-operator --name prometheus-operator --namespace monitoring
 mkdir -p helm/kube-prometheus/charts
-helm package -d helm/kube-prometheus/charts helm/alertmanager helm/grafana helm/prometheus  helm/exporter-kube-dns helm/exporter-kube-scheduler helm/exporter-kubelets helm/exporter-node helm/exporter-kube-controller-manager helm/exporter-kube-etcd helm/exporter-kube-state helm/exporter-coredns helm/exporter-kubernetes
+helm package -d helm/kube-prometheus/charts helm/alertmanager helm/grafana helm/prometheus  helm/exporter-kube-dns \
+helm/exporter-kube-scheduler helm/exporter-kubelets helm/exporter-node helm/exporter-kube-controller-manager \
+helm/exporter-kube-etcd helm/exporter-kube-state helm/exporter-coredns helm/exporter-kubernetes
 helm install helm/kube-prometheus --name kube-prometheus --namespace monitoring
 
 ```
diff --git a/helm/kube-prometheus/Chart.yaml b/helm/kube-prometheus/Chart.yaml
index 39a3e2c31..2f0234188 100644
--- a/helm/kube-prometheus/Chart.yaml
+++ b/helm/kube-prometheus/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
 name: kube-prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.84
+version: 0.0.85
diff --git a/helm/kube-prometheus/requirements.yaml b/helm/kube-prometheus/requirements.yaml
index b665a4aa3..c23d31a4b 100644
--- a/helm/kube-prometheus/requirements.yaml
+++ b/helm/kube-prometheus/requirements.yaml
@@ -20,6 +20,7 @@ dependencies:
     version: 0.1.9
     #e2e-repository: file://../exporter-kube-controller-manager
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
+    condition: deployKubeControllerManager
 
   - name: exporter-kube-dns
     version: 0.1.7
@@ -37,16 +38,19 @@ dependencies:
     version: 0.1.8
     #e2e-repository: file://../exporter-kube-scheduler
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
+    condition: deployKubeScheduler
 
   - name: exporter-kube-state
     version: 0.2.3
     #e2e-repository: file://../exporter-kube-state
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
+    condition: deployKubeState
 
   - name: exporter-kubelets
     version: 0.2.10
     #e2e-repository: file://../exporter-kubelets
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
+    condition: deployKubelets
 
   - name: exporter-kubernetes
     version: 0.1.9
diff --git a/helm/kube-prometheus/values.yaml b/helm/kube-prometheus/values.yaml
index 3a5e3ddbf..04525ec75 100644
--- a/helm/kube-prometheus/values.yaml
+++ b/helm/kube-prometheus/values.yaml
@@ -4,6 +4,18 @@ deployExporterNode: True
 # Grafana
 deployGrafana: True
 
+# Kubelets
+deployKubelets: True
+
+# Kube-scheduler
+deployKubeScheduler: True
+
+# Controller Manager
+deployKubeControllerManager: True
+
+# Kube state
+deployKubeState: True
+
 ## If true, create & use RBAC resources resp. Pod Security Policies
 ##
 global: