diff --git a/stable/heapster/Chart.yaml b/stable/heapster/Chart.yaml
index e92b107a51..033bc905fe 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: 1.0.1
+version: 1.0.2
 appVersion: 1.5.4
 home: https://github.com/kubernetes/heapster
 sources:
diff --git a/stable/heapster/README.md b/stable/heapster/README.md
index 8721194055..e318e8a400 100644
--- a/stable/heapster/README.md
+++ b/stable/heapster/README.md
@@ -1,3 +1,9 @@
+# Retired
+
+Heapster work has been stopped. All efforts have been moved to metrics-server.
+Metrics server helm chart is located at: https://github.com/helm/charts/tree/master/stable/metrics-server
+More info on: https://github.com/kubernetes-retired/heapster
+
 # Heapster
 
 [Heapster](https://github.com/kubernetes/heapster) enables Container Cluster Monitoring and Performance Analysis. It collects and interprets various signals like compute resource usage, lifecycle events, etc, and exports cluster metrics via REST endpoints.
diff --git a/stable/heapster/templates/deployment.yaml b/stable/heapster/templates/deployment.yaml
index e1f39ee884..48ccafe0c2 100644
--- a/stable/heapster/templates/deployment.yaml
+++ b/stable/heapster/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "heapster.fullname" . }}
@@ -11,6 +11,9 @@ metadata:
     {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "heapster.fullname" . }}
   template:
     metadata:
       annotations: