diff --git a/cluster/addons/cluster-monitoring/v1beta3/grafana-service.yaml b/cluster/addons/cluster-monitoring/v1beta3/grafana-service.yaml
index 37d0a48855..9597507430 100644
--- a/cluster/addons/cluster-monitoring/v1beta3/grafana-service.yaml
+++ b/cluster/addons/cluster-monitoring/v1beta3/grafana-service.yaml
@@ -3,11 +3,13 @@ kind: Service
 metadata: 
   labels: 
     name: influxGrafana
+    kubernetes.io/cluster-service: "true"
   name: monitoring-grafana
 spec: 
   containerPort: 80
   port: 80
   selector: 
     name: influxGrafana
+    kubernetes.io/cluster-service: "true"
 
 
diff --git a/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml b/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
index 5e4e1d7d5f..6d73e95083 100644
--- a/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
@@ -16,12 +16,20 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: kubernetes/heapster:v0.8
+        - image: kubernetes/heapster:v0.9
           name: heapster
           env: 
             - name: "INFLUXDB_HOST"
               value: "monitoring-influxdb"
-          ports: 
-            - containerPort: 5701
-              name: heapster
+            - name: "SINK"
+              value: "influxdb"
+          volumeMounts:
+            - name: ssl-certs
+              mountPath: /etc/ssl/certs
+              readOnly: true
+      volumes:
+        - name: ssl-certs
+          source:
+            hostDir:
+              path: /etc/ssl/certs
 
diff --git a/cluster/addons/cluster-monitoring/v1beta3/heapster-service.yaml b/cluster/addons/cluster-monitoring/v1beta3/heapster-service.yaml
index 60686c2dc3..ee39a3d90e 100644
--- a/cluster/addons/cluster-monitoring/v1beta3/heapster-service.yaml
+++ b/cluster/addons/cluster-monitoring/v1beta3/heapster-service.yaml
@@ -3,11 +3,13 @@ kind: Service
 metadata: 
   labels: 
     name: heapster
+    kubernetes.io/cluster-service: "true"
   name: monitoring-heapster
 spec: 
   containerPort: 8082
   port: 80
   selector: 
     name: heapster
+    kubernetes.io/cluster-service: "true"
 
 
diff --git a/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
index 60f8a17576..55a2d65175 100644
--- a/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
@@ -4,7 +4,7 @@ metadata:
   labels: 
     name: influxGrafana
     kubernetes.io/cluster-service: "true"
-  name: monitoring-influx-grafana
+  name: monitoring-influx-grafana-controller
 spec: 
   replicas: 1
   selector: 
@@ -24,7 +24,9 @@ spec:
             - containerPort: 8086
               hostPort: 8086
         - name: grafana
-          image: kubernetes/heapster_grafana:v0.4
+          image: kubernetes/heapster_grafana:v0.5
+          ports:
+              - containerPort: 80
           env: 
             - name: "HTTP_USER"
               value: "admin"
@@ -36,3 +38,5 @@ spec:
               value: '"+window.location.hostname+"/api/v1beta1/proxy/services/monitoring-influxdb'
             - name: "INFLUXDB_PORT"
               value: ""
+            - name: "KUBERNETES_API_PORT"
+              value: ""
diff --git a/cluster/addons/cluster-monitoring/v1beta3/influxdb-ui-service.yaml b/cluster/addons/cluster-monitoring/v1beta3/influxdb-ui-service.yaml
new file mode 100644
index 0000000000..b77c8ab8eb
--- /dev/null
+++ b/cluster/addons/cluster-monitoring/v1beta3/influxdb-ui-service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1beta3
+kind: Service
+metadata: 
+  labels: 
+    name: influxGrafana
+  name: monitoring-influxdb-ui
+spec: 
+  containerPort: 8083
+  port: 80
+  selector: 
+    name: influxGrafana
+
+