diff --git a/stable/heapster/Chart.yaml b/stable/heapster/Chart.yaml
index ee0657bb7bca..c2e7d9ee5bd1 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.1.0
+version: 0.1.1
 sources:
   - https://github.com/kubernetes/heapster
   - https://github.com/kubernetes/contrib/tree/master/addon-resizer
diff --git a/stable/heapster/templates/_helpers.tpl b/stable/heapster/templates/_helpers.tpl
index afb73b4075cf..a75a8d5268ca 100644
--- a/stable/heapster/templates/_helpers.tpl
+++ b/stable/heapster/templates/_helpers.tpl
@@ -20,6 +20,5 @@ Create a service name that defaults to app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "service.fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- .Values.service.nameOverride | default (printf "%s-%s" .Release.Name $name) | trunc 63 | trimSuffix "-" -}}
+{{- .Values.service.nameOverride | default .Chart.Name }}
 {{- end -}}
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 2cef479eeb98..ab703d7544e8 100644
--- a/stable/heapster/values.yaml
+++ b/stable/heapster/values.yaml
@@ -5,13 +5,26 @@ image:
   repository: gcr.io/google_containers/heapster
   tag: v1.3.0
   pullPolicy: IfNotPresent
+## Here labels can be added to the heapster deployment
+# labels:
+#   kubernetes.io/cluster-service: "true"
+#   kubernetes.io/name: "Heapster"
+labels:
+
 service:
   type: ClusterIP
   externalPort: 8082
   internalPort: 8082
   ## This allows an overide of the heapster service name
-  ## Default: {{ template "fullname" . }}
+  ## Default: {{ .Chart.Name }}
   # nameOverride:
+
+  ## Here labels can be added to the heapster service
+  # labels:
+  #   kubernetes.io/cluster-service: "true"
+  #   kubernetes.io/name: "Heapster"
+  labels:
+
 resources:
   limits:
     cpu: 100m