diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index 360b8a5905a..be926dfd36c 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -6,26 +6,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v10
+  name: heapster-v11
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v10
+    version: v11
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v10
+    version: v11
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v10
+        version: v11
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.2
+        - image: gcr.io/google_containers/heapster:v0.18.4
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index 57b6b3ee1c0..78637d8bbc8 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -6,26 +6,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v10
+  name: heapster-v11
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v10
+    version: v11
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v10
+    version: v11
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v10
+        version: v11
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.2
+        - image: gcr.io/google_containers/heapster:v0.18.4
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index f2639da0d71..5d1766260f3 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -6,26 +6,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v10
+  name: heapster-v11
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v10
+    version: v11
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v10
+    version: v11
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v10
+        version: v11
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.2
+        - image: gcr.io/google_containers/heapster:v0.18.4
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index 6b6530ee19d..6600dacb129 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -6,26 +6,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v10
+  name: heapster-v11
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v10
+    version: v11
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v10
+    version: v11
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v10
+        version: v11
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.2
+        - image: gcr.io/google_containers/heapster:v0.18.4
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class