diff --git a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml
index 1435425a93d..af68656ec6c 100644
--- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -1,26 +1,26 @@
-apiVersion: extensions/v1beta1
+apiVersion: extensions/v1beta2
 kind: Deployment
 metadata:
-  name: heapster-v1.1.0.beta1
+  name: heapster-v1.1.0.beta2
   namespace: kube-system
   labels:
     k8s-app: heapster
     kubernetes.io/cluster-service: "true"
-    version: v1.1.0.beta1
+    version: v1.1.0.beta2
 spec:
   replicas: 1
   selector:
     matchLabels:
       k8s-app: heapster
-      version: v1.1.0.beta1
+      version: v1.1.0.beta2
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v1.1.0.beta1
+        version: v1.1.0.beta2
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -34,7 +34,6 @@ spec:
             - /heapster
             - --source=kubernetes.summary_api:''
             - --sink=gcm
-            - --metric_resolution=60s
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
@@ -42,7 +41,7 @@ spec:
             - name: usrsharecacerts
               mountPath: /usr/share/ca-certificates
               readOnly: true
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -88,7 +87,7 @@ spec:
             - --memory=300Mi
             - --extra-memory=4Mi
             - --threshold=5
-            - --deployment=heapster-v1.1.0.beta1
+            - --deployment=heapster-v1.1.0.beta2
             - --container=heapster
             - --poll-period=300000
         - image: gcr.io/google_containers/addon-resizer:1.0
@@ -116,7 +115,7 @@ spec:
             - --memory=300Mi
             - --extra-memory=307200Ki
             - --threshold=5
-            - --deployment=heapster-v1.1.0.beta1
+            - --deployment=heapster-v1.1.0.beta2
             - --container=eventer
             - --poll-period=300000
       volumes:
@@ -125,4 +124,4 @@ spec:
             path: "/etc/ssl/certs"
         - name: usrsharecacerts
           hostPath:
-            path: "/usr/share/ca-certificates"
\ No newline at end of file
+            path: "/usr/share/ca-certificates"
diff --git a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index 63629736768..59e90ae4097 100644
--- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -1,26 +1,26 @@
-apiVersion: extensions/v1beta1
+apiVersion: extensions/v1beta2
 kind: Deployment
 metadata:
-  name: heapster-v1.1.0.beta1
+  name: heapster-v1.1.0.beta2
   namespace: kube-system
   labels:
     k8s-app: heapster
     kubernetes.io/cluster-service: "true"
-    version: v1.1.0.beta1
+    version: v1.1.0.beta2
 spec:
   replicas: 1
   selector:
     matchLabels:
       k8s-app: heapster
-      version: v1.1.0.beta1
+      version: v1.1.0.beta2
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v1.1.0.beta1
+        version: v1.1.0.beta2
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -35,7 +35,6 @@ spec:
             - --source=kubernetes.summary_api:''
             - --sink=influxdb:http://monitoring-influxdb:8086
             - --sink=gcm:?metrics=autoscaling
-            - --metric_resolution=60s
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
@@ -43,7 +42,7 @@ spec:
             - name: usrsharecacerts
               mountPath: /usr/share/ca-certificates
               readOnly: true
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -89,7 +88,7 @@ spec:
             - --memory=300Mi
             - --extra-memory=4Mi
             - --threshold=5
-            - --deployment=heapster-v1.1.0.beta1
+            - --deployment=heapster-v1.1.0.beta2
             - --container=heapster
             - --poll-period=300000
         - image: gcr.io/google_containers/addon-resizer:1.0
@@ -117,7 +116,7 @@ spec:
             - --memory=300Mi
             - --extra-memory=307200Ki
             - --threshold=5
-            - --deployment=heapster-v1.1.0.beta1
+            - --deployment=heapster-v1.1.0.beta2
             - --container=eventer
             - --poll-period=300000
       volumes:
@@ -126,4 +125,4 @@ spec:
             path: "/etc/ssl/certs"
         - name: usrsharecacerts
           hostPath:
-            path: "/usr/share/ca-certificates"
\ No newline at end of file
+            path: "/usr/share/ca-certificates"
diff --git a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index 2840ab07ea9..116e94771b7 100644
--- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -1,26 +1,26 @@
-apiVersion: extensions/v1beta1
+apiVersion: extensions/v1beta2
 kind: Deployment
 metadata:
-  name: heapster-v1.1.0.beta1
+  name: heapster-v1.1.0.beta2
   namespace: kube-system
   labels:
     k8s-app: heapster
     kubernetes.io/cluster-service: "true"
-    version: v1.1.0.beta1
+    version: v1.1.0.beta2
 spec:
   replicas: 1
   selector:
     matchLabels:
       k8s-app: heapster
-      version: v1.1.0.beta1
+      version: v1.1.0.beta2
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v1.1.0.beta1
+        version: v1.1.0.beta2
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -34,8 +34,7 @@ spec:
             - /heapster
             - --source=kubernetes.summary_api:''
             - --sink=influxdb:http://monitoring-influxdb:8086
-            - --metric_resolution=60s
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
           name: eventer
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -74,7 +73,7 @@ spec:
             - --memory=300Mi
             - --extra-memory=4Mi
             - --threshold=5
-            - --deployment=heapster-v1.1.0.beta1
+            - --deployment=heapster-v1.1.0.beta2
             - --container=heapster
             - --poll-period=300000
         - image: gcr.io/google_containers/addon-resizer:1.0
@@ -102,6 +101,6 @@ spec:
             - --memory=300Mi
             - --extra-memory=307200Ki
             - --threshold=5
-            - --deployment=heapster-v1.1.0.beta1
+            - --deployment=heapster-v1.1.0.beta2
             - --container=eventer
             - --poll-period=300000
diff --git a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml
index 95a762c36f4..c737d4f4096 100644
--- a/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -1,26 +1,26 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: heapster-v1.1.0.beta1
+  name: heapster-v1.1.0.beta2
   namespace: kube-system
   labels:
     k8s-app: heapster
     kubernetes.io/cluster-service: "true"
-    version: v1.1.0.beta1
+    version: v1.1.0.beta2
 spec:
   replicas: 1
   selector:
     matchLabels:
       k8s-app: heapster
-      version: v1.1.0.beta1
+      version: v1.1.0.beta2
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v1.1.0.beta1
+        version: v1.1.0.beta2
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta2
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -33,7 +33,6 @@ spec:
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
-            - --metric_resolution=60s
         - image: gcr.io/google_containers/addon-resizer:1.0
           name: heapster-nanny
           resources:
@@ -59,6 +58,6 @@ spec:
             - --memory=300Mi
             - --extra-memory=4Mi
             - --threshold=5
-            - --deployment=heapster-v1.1.0.beta1
+            - --deployment=heapster-v1.1.0.beta2
             - --container=heapster
-            - --poll-period=300000
\ No newline at end of file
+            - --poll-period=300000