diff --git a/bitnami/kube-prometheus/Chart.yaml b/bitnami/kube-prometheus/Chart.yaml
index 3641e210ee..62c8c36ad5 100644
--- a/bitnami/kube-prometheus/Chart.yaml
+++ b/bitnami/kube-prometheus/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.42.1
 description: kube-prometheus collects Kubernetes manifests to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
 name: kube-prometheus
-version: 2.0.1
+version: 2.1.0
 keywords:
   - prometheus
   - alertmanager
diff --git a/bitnami/kube-prometheus/README.md b/bitnami/kube-prometheus/README.md
index 301519c56a..9904e578f5 100644
--- a/bitnami/kube-prometheus/README.md
+++ b/bitnami/kube-prometheus/README.md
@@ -247,7 +247,7 @@ The following table lists the configurable parameters of the kube-prometheus cha
 | `prometheus.thanos.objectStorageConfig.secretName`    | Defines the secretName to load.                                                                                     | `nil`                                                                                                                                   |
 | `prometheus.thanos.objectStorageConfig.secretKey`     | Defines the key inside the secret which references the objectStorageConfig for the thanos sideCar                   | `nil`                                                                                                                                   |
 | `prometheus.thanos.service.port`                      | Thanos service port                                                                                                 | `10901`                                                                                                                                 |
-| `prometheus.thanos.service.clusterIP`                 | Specific cluster IP when service type is cluster IP. Use `None` for headless service                                | `nil`                                                                                                                                   |
+| `prometheus.thanos.service.clusterIP`                 | Specific cluster IP when service type is cluster IP. Use `None` to create headless service by default.              | `None`                                                                                                                                   |
 | `prometheus.thanos.service.nodePort`                  | Kubernetes Service nodePort                                                                                         | `nil`                                                                                                                                   |
 | `prometheus.thanos.service.loadBalancerIP`            | `loadBalancerIP` if service type is `LoadBalancer`                                                                  | `nil`                                                                                                                                   |
 | `prometheus.thanos.service.loadBalancerSourceRanges`  | Address that are allowed when svc is `LoadBalancer`                                                                 | `[]`                                                                                                                                    |
@@ -458,6 +458,25 @@ prometheus.additionalAlertRelabelConfigsExternal.key=additional-alert-relabel-co
 $ helm upgrade my-release bitnami/kube-prometheus
 ```
 
+### To 2.1.0
+
+> Note: ignore these instructions if you did not enabled the Thanos sidecar on Prometheus pods.
+
+The Thanos sidecar svc is transformed into a headless service by default so Thanos can discover every available sidecar. You can undo this change by setting the `prometheus.thanos.service.clusterIP` parameter to an emtpy string `""`.
+
+To upgrade from version 2.0.0, previously remove the Thanos sidecar svc to avoid issues with immutable fields:
+
+```bash
+$ kubectl delete svc my-relase-kube-prometheus-prometheus-thanos
+$ helm upgrade my-release --set prometheus.thanos.create=true bitnami/kube-prometheus
+```
+
+### To 2.0.0
+
+- CRDs were updated to the latest prometheus-operator v0.4.1 release artifacts
+  - The apiVersion of CRDs was updated from `apiextensions.k8s.io/v1beta1` to `apiextensions.k8s.io/v1`
+  - Kubernetes 1.16 is required
+  
 ### To 1.0.0
 
 - The chart was renamed to `kube-prometheus` to be more accurate with the actual capabilities of the chart: it does not just deploy the Prometheus operator, it deploys an entire cluster monitoring stack, that includes other components (e.g. NodeExporter or Kube State metrics). Find more information about the reasons behind this decision at [#3490](https://github.com/bitnami/charts/issues/3490).
@@ -465,9 +484,3 @@ $ helm upgrade my-release bitnami/kube-prometheus
 - This version also introduces `bitnami/common`, a [library chart](https://helm.sh/docs/topics/library_charts/#helm) as a dependency. More documentation about this new utility could be found [here](https://github.com/bitnami/charts/tree/master/bitnami/common#bitnami-common-library-chart). Please, make sure that you have updated the chart dependencies before executing any upgrade.
 
 > Note: There is no backwards compatibility due to the above mentioned changes. It's necessary to install a new release of the chart, and migrate the existing TSDB data to the new Prometheus instances.
-
-### To 2.0.0
-
-- CRDs were updated to the latest prometheus-operator v0.4.1 release artifacts
-  - The apiVersion of CRDs was updated from `apiextensions.k8s.io/v1beta1` to `apiextensions.k8s.io/v1`
-  - Kubernetes 1.16 is required
diff --git a/bitnami/kube-prometheus/values-production.yaml b/bitnami/kube-prometheus/values-production.yaml
index 94057a2a1b..a8d210abdb 100644
--- a/bitnami/kube-prometheus/values-production.yaml
+++ b/bitnami/kube-prometheus/values-production.yaml
@@ -730,7 +730,10 @@ prometheus:
       ##
       type: ClusterIP
       port: 10901
-      # clusterIP: None
+      ## Use a "headless" service by default so it returns every pod's IP
+      ## instead of loadbalancing requests.
+      ##
+      clusterIP: None
 
       ## Specify the nodePort value for the LoadBalancer and NodePort service types.
       ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
diff --git a/bitnami/kube-prometheus/values.yaml b/bitnami/kube-prometheus/values.yaml
index 83e2bc4e59..ea02f47615 100644
--- a/bitnami/kube-prometheus/values.yaml
+++ b/bitnami/kube-prometheus/values.yaml
@@ -736,7 +736,10 @@ prometheus:
       ##
       type: ClusterIP
       port: 10901
-      # clusterIP: None
+      ## Use a "headless" service by default so it returns every pod's IP
+      ## instead of loadbalancing requests.
+      ##
+      clusterIP: None
 
       ## Specify the nodePort value for the LoadBalancer and NodePort service types.
       ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport