diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index db6d6f12dcd..f58310859ba 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -1,9 +1,11 @@
 {% set metrics_memory = "200Mi" -%}
 {% set eventer_memory = "200Mi" -%}
+{% set metrics_memory_per_node = 4 -%}
+{% set eventer_memory_per_node = 500 -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
 {% if num_nodes >= 0 -%}
-  {% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
-  {% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%}
+  {% set metrics_memory = (200 + num_nodes * metrics_memory_per_node)|string + "Mi" -%}
+  {% set eventer_memory = (200 * 1024 + num_nodes * eventer_memory_per_node)|string + "Ki" -%}
 {% endif -%}
 
 apiVersion: extensions/v1beta1
@@ -85,8 +87,8 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory=200Mi
-            - --extra-memory=3Mi
+            - --memory={{ metrics_memory }}
+            - --extra-memory={{metrics_memory_per_node}}Mi
             - --threshold=5
             - --deployment=heapster
             - --container=heapster
@@ -113,8 +115,8 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory=200Mi
-            - --extra-memory=3Mi
+            - --memory={{eventer_memory}}
+            - --extra-memory={{eventer_memory_per_node}}Ki
             - --threshold=5
             - --deployment=heapster
             - --container=eventer
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index a464871fc82..9dc3665e6dd 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -1,9 +1,11 @@
 {% set metrics_memory = "200Mi" -%}
 {% set eventer_memory = "200Mi" -%}
+{% set metrics_memory_per_node = 4 -%}
+{% set eventer_memory_per_node = 500 -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
 {% if num_nodes >= 0 -%}
-  {% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
-  {% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%}
+  {% set metrics_memory = (200 + num_nodes * metrics_memory_per_node)|string + "Mi" -%}
+  {% set eventer_memory = (200 * 1024 + num_nodes * eventer_memory_per_node)|string + "Ki" -%}
 {% endif -%}
 
 apiVersion: extensions/v1beta1
@@ -86,8 +88,8 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory=200Mi
-            - --extra-memory=3Mi
+            - --memory={{ metrics_memory }}
+            - --extra-memory={{ metrics_memory_per_node }}Mi
             - --threshold=5
             - --deployment=heapster
             - --container=heapster
@@ -114,8 +116,8 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory=200Mi
-            - --extra-memory=3Mi
+            - --memory={{ eventer_memory }}
+            - --extra-memory={{ eventer_memory_per_node }}Ki
             - --threshold=5
             - --deployment=heapster
             - --container=eventer
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index cbfa5b10e7b..2ea4bbf3b1e 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -1,9 +1,11 @@
 {% set metrics_memory = "200Mi" -%}
 {% set eventer_memory = "200Mi" -%}
+{% set metrics_memory_per_node = 4 -%}
+{% set eventer_memory_per_node = 500 -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
 {% if num_nodes >= 0 -%}
-  {% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
-  {% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%}
+  {% set metrics_memory = (200 + num_nodes * metrics_memory_per_node)|string + "Mi" -%}
+  {% set eventer_memory = (200 * 1024 + num_nodes * eventer_memory_per_node)|string + "Ki" -%}
 {% endif -%}
 
 apiVersion: extensions/v1beta1
@@ -77,8 +79,8 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory=200Mi
-            - --extra-memory=3Mi
+            - --memory={{ metrics_memory }}
+            - --extra-memory={{ metrics_memory_per_node }}Mi
             - --threshold=5
             - --deployment=heapster
             - --container=heapster
@@ -105,8 +107,8 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory=200Mi
-            - --extra-memory=3Mi
+            - --memory={{ eventer_memory }}
+            - --extra-memory={{ eventer_memory_per_node }}Ki
             - --threshold=5
             - --deployment=heapster
             - --container=eventer
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index 0fce59e364f..0537171dfd7 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -1,7 +1,8 @@
 {% set metrics_memory = "200Mi" -%}
+{% set metrics_memory_per_node = 4 -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
 {% if num_nodes >= 0 -%}
-  {% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
+  {% set metrics_memory = (200 + num_nodes * metrics_memory_per_node)|string + "Mi" -%}
 {% endif -%}
 
 apiVersion: extensions/v1beta1
@@ -60,8 +61,8 @@ spec:
             - /pod_nanny
             - --cpu=100m
             - --extra-cpu=0m
-            - --memory=200Mi
-            - --extra-memory=3Mi
+            - --memory={{ metrics_memory }}
+            - --extra-memory={{ metrics_memory_per_node }}Mi
             - --threshold=5
             - --deployment=heapster
             - --container=heapster