diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index 4c2a019bde5..730b054f041 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -30,6 +30,8 @@ spec:
             - /heapster
             - --source=kubernetes:''
             - --sink=gcm
+            - --sink=gcmautoscaling
             - --sink=gcl
+            - --align_stats
             - --poll_duration=2m
             - --stats_resolution=1m
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index 9932e6e2f38..4c810416ce7 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -30,6 +30,8 @@ spec:
             - /heapster
             - --source=kubernetes:''
             - --sink=gcl
+            - --sink=gcmautoscaling
             - --sink=influxdb:http://monitoring-influxdb:8086
+            - --align_stats
             - --poll_duration=2m
             - --stats_resolution=1m