diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index b9fde8d2825..a4e44becff6 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -1,22 +1,22 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v7
+  name: monitoring-heapster-v8
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v7
+    version: v8
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v7
+    version: v8
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v7
+        version: v8
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
@@ -32,7 +32,6 @@ spec:
             - --sink=gcm
             - --sink=gcmautoscaling
             - --sink=gcl
-            - --align_stats
             - --poll_duration=2m
             - --stats_resolution=1m
           volumeMounts:
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index ad089d67908..69c51ad5e5d 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -1,22 +1,22 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v7
+  name: monitoring-heapster-v8
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v7
+    version: v8
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v7
+    version: v8
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v7
+        version: v8
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
@@ -32,7 +32,6 @@ spec:
             - --sink=gcl
             - --sink=gcmautoscaling
             - --sink=influxdb:http://monitoring-influxdb:8086
-            - --align_stats
             - --poll_duration=2m
             - --stats_resolution=1m
           volumeMounts:
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index 5838f03e2e8..fbc3badfdff 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -1,22 +1,22 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v7
+  name: monitoring-heapster-v8
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v7
+    version: v8
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v7
+    version: v8
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v7
+        version: v8
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index 954c261ad20..9d694b3d83e 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -1,22 +1,22 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-heapster-v7
+  name: monitoring-heapster-v8
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v7
+    version: v8
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v7
+    version: v8
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v7
+        version: v8
         kubernetes.io/cluster-service: "true"
     spec:
       containers: