diff --git a/stable/heapster/Chart.yaml b/stable/heapster/Chart.yaml
index 60b3e38251..8315dd2d4b 100644
--- a/stable/heapster/Chart.yaml
+++ b/stable/heapster/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Heapster enables Container Cluster Monitoring and Performance Analysis.
 name: heapster
-version: 0.2.0
+version: 0.2.1
 sources:
 - https://github.com/kubernetes/heapster
 - https://github.com/kubernetes/contrib/tree/master/addon-resizer
diff --git a/stable/heapster/README.md b/stable/heapster/README.md
index 92baa51a17..9b7bf12a52 100644
--- a/stable/heapster/README.md
+++ b/stable/heapster/README.md
@@ -45,6 +45,7 @@ The default configuration values for this chart are listed in `values.yaml`.
 | `rbac.create`                         | Bind system:heapster role                                    | false                                             |
 | `rbac.serviceAccountName`             | existing ServiceAccount to use (ignored if rbac.create=true) | default                                           |
 | `resizer.enabled`                     | If enabled, scale resources                                  | true                                              |
+| `nodeSelector`                        | Node labels for pod assignment                               | `{}`                                              |
 
 The table below is only applicable if `resizer.enabled` is `true`. More information on resizer can be found [here](https://github.com/kubernetes/contrib/blob/master/addon-resizer/README.md).
 
diff --git a/stable/heapster/templates/deployment.yaml b/stable/heapster/templates/deployment.yaml
index 6f47eef9d2..22e53a6f74 100644
--- a/stable/heapster/templates/deployment.yaml
+++ b/stable/heapster/templates/deployment.yaml
@@ -15,8 +15,10 @@ spec:
         app: {{ template "heapster.fullname" . }}
     spec:
       serviceAccountName: {{ if .Values.rbac.create }}{{ template "heapster.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
+{{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/stable/heapster/values.yaml b/stable/heapster/values.yaml
index 4bc15b7402..e31693fcfa 100644
--- a/stable/heapster/values.yaml
+++ b/stable/heapster/values.yaml
@@ -10,6 +10,10 @@ image:
 #   kubernetes.io/cluster-service: "true"
 #   kubernetes.io/name: "Heapster"
 labels: {}
+
+## Node labels for pod assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
 nodeSelector: {}
 
 service: