diff --git a/stable/heapster/templates/deployment.yaml b/stable/heapster/templates/deployment.yaml
index 3544550deca3..020bcde75e73 100644
--- a/stable/heapster/templates/deployment.yaml
+++ b/stable/heapster/templates/deployment.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ template "fullname" . }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    {{- range $key, $value := .Values.labels }}
+    {{ $key }}: {{ $value }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   template:
diff --git a/stable/heapster/templates/service.yaml b/stable/heapster/templates/service.yaml
index 6dcf31312545..693094dc3c1f 100644
--- a/stable/heapster/templates/service.yaml
+++ b/stable/heapster/templates/service.yaml
@@ -7,6 +7,9 @@ metadata:
     app: {{ template "fullname" . }}
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
+    {{- range $key, $value := .Values.service.labels }}
+    {{ $key }}: {{ $value }}
+    {{- end }}    
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/stable/heapster/values.yaml b/stable/heapster/values.yaml
index 6c8b7eb9e967..4ea2ef659513 100644
--- a/stable/heapster/values.yaml
+++ b/stable/heapster/values.yaml
@@ -5,6 +5,12 @@ image:
   repository: gcr.io/google_containers/heapster
   tag: v1.3.0
   pullPolicy: IfNotPresent
+## Here labels can be added to the hepaster deployment
+# labels:
+#   kubernetes.io/cluster-service: "true"
+#   kubernetes.io/name: "Heapster"
+labels:
+
 service:
   type: ClusterIP
   externalPort: 8082
@@ -12,6 +18,13 @@ service:
   ## This allows an overide of the heapster service name
   ## Default: {{ .Chart.Name }}
   # nameOverride:
+
+  ## Here labels can be added to the hepaster service
+  # labels:
+  #   kubernetes.io/cluster-service: "true"
+  #   kubernetes.io/name: "Heapster"
+  labels:
+
 resources:
   limits:
     cpu: 100m