diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index dfa8495a971..4c2a019bde5 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v5
+  name: monitoring-heapster-v6
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v5
+    version: v6
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v5
+    version: v6
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v5
+        version: v6
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.16.0
+        - image: gcr.io/google_containers/heapster:v0.17.0
           name: heapster
           resources:
             limits:
@@ -33,11 +33,3 @@ spec:
             - --sink=gcl
             - --poll_duration=2m
             - --stats_resolution=1m
-          volumeMounts: 
-            - name: ssl-certs
-              mountPath: /etc/ssl/certs
-              readOnly: true
-      volumes: 
-        - name: ssl-certs
-          hostPath: 
-            path: "/etc/ssl/certs"
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index fcddb56ce41..9932e6e2f38 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v5
+  name: monitoring-heapster-v6
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v5
+    version: v6
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v5
+    version: v6
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v5
+        version: v6
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.16.0
+        - image: gcr.io/google_containers/heapster:v0.17.0
           name: heapster
           resources:
             limits:
@@ -33,11 +33,3 @@ spec:
             - --sink=influxdb:http://monitoring-influxdb:8086
             - --poll_duration=2m
             - --stats_resolution=1m
-          volumeMounts: 
-            - name: ssl-certs
-              mountPath: /etc/ssl/certs
-              readOnly: true
-      volumes: 
-        - name: ssl-certs
-          hostPath: 
-            path: "/etc/ssl/certs"
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index e58d7f9b3c2..320561290dd 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v5
+  name: monitoring-heapster-v6
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v5
+    version: v6
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v5
+    version: v6
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v5
+        version: v6
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.16.0
+        - image: gcr.io/google_containers/heapster:v0.17.0
           name: heapster
           resources:
             limits:
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index 584402df888..8a9598e5ddc 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v5
+  name: monitoring-heapster-v6
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v5
+    version: v6
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v5
+    version: v6
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v5
+        version: v6
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.16.0
+        - image: gcr.io/google_containers/heapster:v0.17.0
           name: heapster
           resources:
             limits: