diff --git a/cluster/addons/cluster-monitoring/heapster-controller.yaml b/cluster/addons/cluster-monitoring/heapster-controller.yaml
index 616798cda58..f8207bcbf6e 100644
--- a/cluster/addons/cluster-monitoring/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/heapster-controller.yaml
@@ -12,14 +12,12 @@ desiredState:
         id: monitoring-heapster
         containers:
           - name: heapster
-            image: gcr.io/google_containers/heapster:v0.10.0
+            image: gcr.io/google_containers/heapster:v0.11.0
             env:
               - name: "INFLUXDB_HOST"
                 value: "monitoring-influxdb"
               - name: "SINK"
                 value: "influxdb"
-              - name: "FLAGS"
-                value: "--kubelet_port=10255"
             volumeMounts:
               - name: ssl-certs
                 mountPath: /etc/ssl/certs
diff --git a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
index dad3c4aa26c..9373b9e7c63 100644
--- a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
@@ -22,7 +22,7 @@ desiredState:
               - containerPort: 8086
                 hostPort: 8086
           - name: grafana
-            image: gcr.io/google_containers/heapster_grafana:v0.6
+            image: gcr.io/google_containers/heapster_grafana:v0.7
             env: 
               - name: "INFLUXDB_EXTERNAL_URL"
                 value: '/api/v1beta1/proxy/services/monitoring-grafana/db/'
diff --git a/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml b/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
index 5c426118430..e9190d54c3c 100644
--- a/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
@@ -16,15 +16,13 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: gcr.io/google_containers/heapster:v0.10.0
+        - image: gcr.io/google_containers/heapster:v0.11.0
           name: heapster
           env: 
             - name: "INFLUXDB_HOST"
-              value: "monitoring-influxdb"
+              value: "http://monitoring-influxdb"
             - name: "SINK"
               value: "influxdb"
-            - name: "FLAGS"
-              value: "--kubelet_port=10255"
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
diff --git a/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
index 7d4a7bb7858..31f4adbdb3c 100644
--- a/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
@@ -24,10 +24,10 @@ spec:
             - containerPort: 8086
               hostPort: 8086
         - name: grafana
-          image: gcr.io/google_containers/heapster_grafana:v0.6
+          image: gcr.io/google_containers/heapster_grafana:v0.7
           env: 
             - name: "INFLUXDB_EXTERNAL_URL"
-              value: '/api/v1beta1/proxy/services/monitoring-grafana/db/'
+              value: '/api/v1beta3/proxy/namespaces/system/services/monitoring-grafana/db/'
             - name: "INFLUXDB_HOST"
               value: 'monitoring-influxdb'
             - name: "INFLUXDB_PORT"