diff --git a/stable/heapster/templates/deployment.yaml b/stable/heapster/templates/deployment.yaml
index 020bcde75e..58c395bc9c 100644
--- a/stable/heapster/templates/deployment.yaml
+++ b/stable/heapster/templates/deployment.yaml
@@ -14,6 +14,8 @@ spec:
       labels:
         app: {{ template "fullname" . }}
     spec:
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/stable/heapster/values.yaml b/stable/heapster/values.yaml
index ab703d7544..349d1d8a14 100644
--- a/stable/heapster/values.yaml
+++ b/stable/heapster/values.yaml
@@ -9,7 +9,8 @@ image:
 # labels:
 #   kubernetes.io/cluster-service: "true"
 #   kubernetes.io/name: "Heapster"
-labels:
+labels: {}
+nodeSelector: {}
 
 service:
   type: ClusterIP