diff --git a/cluster/addons/cluster-monitoring/grafana-service.yaml b/cluster/addons/cluster-monitoring/grafana-service.yaml
index f791e7512e4..8c86700c892 100644
--- a/cluster/addons/cluster-monitoring/grafana-service.yaml
+++ b/cluster/addons/cluster-monitoring/grafana-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: "v1beta1"
 kind: "Service"
 id: "monitoring-grafana"
-port: 8087
+port: 80
 containerPort: 80
 selector: 
   name: "influxGrafana"
diff --git a/cluster/addons/cluster-monitoring/heapster-controller.yaml b/cluster/addons/cluster-monitoring/heapster-controller.yaml
index f44f9660398..d3d311edf97 100644
--- a/cluster/addons/cluster-monitoring/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/heapster-controller.yaml
@@ -12,7 +12,11 @@ desiredState:
         id: "monitoring-heapsterController"
         containers:
           - name: "heapster"
-            image: "kubernetes/heapster:v0.5"
+            image: "kubernetes/heapster:v0.6"
+            env: 
+              - name: "INFLUXDB_HOST"
+                value: "monitoring-influxdb"
+
     labels: 
       name: "heapster"
       uses: "monitoring-influxdb"
diff --git a/cluster/addons/cluster-monitoring/heapster-service.yaml b/cluster/addons/cluster-monitoring/heapster-service.yaml
new file mode 100644
index 00000000000..5a068ecbbf6
--- /dev/null
+++ b/cluster/addons/cluster-monitoring/heapster-service.yaml
@@ -0,0 +1,7 @@
+apiVersion: "v1beta1"
+kind: "Service"
+id: "monitoring-heapster"
+port: 80
+containerPort: 8082
+selector: 
+  name: "heapster"
diff --git a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
index c1855390da7..1babc4239e2 100644
--- a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
@@ -14,14 +14,14 @@ desiredState:
         id: "monitoring-influxGrafanaController"
         containers: 
           - name: "influxdb"
-            image: "kubernetes/heapster_influxdb:v0.2"
+            image: "kubernetes/heapster_influxdb:v0.3"
             ports: 
               - containerPort: 8083
                 hostPort: 8083
               - containerPort: 8086
                 hostPort: 8086
           - name: "grafana"
-            image: "kubernetes/heapster_grafana:v0.2"
+            image: "kubernetes/heapster_grafana:v0.3"
             ports: 
               - containerPort: 80
                 hostPort: 80
diff --git a/cluster/addons/cluster-monitoring/influxdb-service.yaml b/cluster/addons/cluster-monitoring/influxdb-service.yaml
index ae51c3c2b24..72597d2408a 100644
--- a/cluster/addons/cluster-monitoring/influxdb-service.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: "v1beta1"
 kind: "Service"
 id: "monitoring-influxdb"
-port: 8085
+port: 80
 containerPort: 8086
 selector: 
   name: "influxGrafana"