diff --git a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
index 50e34419b15..1e0255a42cf 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
@@ -1,29 +1,29 @@
-apiVersion: v1beta1
-kind:  ReplicationController
-id: kibana-logging-controller
-desiredState:
-  replicas: 1
-  replicaSelector:
+apiVersion: v1beta3
+kind: ReplicationController
+metadata:
+  labels:
     name: kibana-logging
-  podTemplate:
-    desiredState:
-      manifest:
-        version: v1beta1
-        id: kibana-viewer
-        containers:
-          - name: kibana-logging
-            image: gcr.io/google_containers/kibana:1.2
-            env: 
-              - name: "ES_SCHEME"
-                value: "https"
-              - name: "ES_HOST"
-                value: "\"+window.location.hostname+\"/api/v1beta3/proxy/namespaces/default/services/elasticsearch-logging"
-            ports:
-              - name: kibana-port
-                containerPort: 80
-    labels:
-      name: kibana-logging
-      kubernetes.io/cluster-service: "true"
-labels:
+    kubernetes.io/cluster-service: "true"
   name: kibana-logging
-  kubernetes.io/cluster-service: "true"
+spec:
+  replicas: 1
+  selector:
+    name: kibana-logging
+  template:
+    metadata:
+      labels:
+        kubernetes.io/cluster-service: "true"
+        name: kibana-logging
+    spec:
+      containers:
+      - env:
+        - name: ES_SCHEME
+          value: https
+        - name: ES_HOST
+          value: '"+window.location.hostname+"/api/v1beta3/proxy/namespaces/default/services/elasticsearch-logging'
+        image: gcr.io/google_containers/kibana:1.2
+        name: kibana-logging
+        ports:
+        - containerPort: 80
+          name: kibana-port
+          protocol: TCP
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
index 346f13a9cfc..f7ccc35292d 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
@@ -1,10 +1,15 @@
-apiVersion: v1beta1
+
+apiVersion: v1beta3
 kind: Service
-id: kibana-logging
-containerPort: 80
-port: 5601
-labels:
-  name: kibana-logging
-  kubernetes.io/cluster-service: "true"
-selector:
+metadata:
+  labels:
+    name: kibana-logging
+    kubernetes.io/cluster-service: "true"
   name: kibana-logging
+spec:
+  ports:
+  - port: 5601
+    protocol: TCP
+    targetPort: kibana-port
+  selector:
+    name: kibana-logging