diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
index d4aeb65d86f..3722209c020 100644
--- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
@@ -1,20 +1,21 @@
 apiVersion: v1beta3
 kind: ReplicationController
 metadata:
+  name: elasticsearch-logging-v1
+  namespace: default
   labels:
-    app: elasticsearch-logging
+    k8s-app: elasticsearch-logging
     version: v1
     kubernetes.io/cluster-service: "true"
-  name: elasticsearch-logging
 spec:
   replicas: 2
   selector:
-    app: elasticsearch-logging
+    k8s-app: elasticsearch-logging
     version: v1
   template:
     metadata:
       labels:
-        app: elasticsearch-logging
+        k8s-app: elasticsearch-logging
         version: v1
         kubernetes.io/cluster-service: "true"
     spec:
diff --git a/cluster/addons/fluentd-elasticsearch/es-service.yaml b/cluster/addons/fluentd-elasticsearch/es-service.yaml
index 9d923b7ce2c..4551b5d6ab6 100644
--- a/cluster/addons/fluentd-elasticsearch/es-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-service.yaml
@@ -1,15 +1,16 @@
 apiVersion: v1beta3
 kind: Service
 metadata:
+  name: elasticsearch-logging
+  namespace: default
   labels:
-    app: elasticsearch-logging
+    k8s-app: elasticsearch-logging
     kubernetes.io/cluster-service: "true"
     kubernetes.io/name: "Elasticsearch"
-  name: elasticsearch-logging
 spec:
   ports:
   - port: 9200
     protocol: TCP
     targetPort: es-port
   selector:
-    app: elasticsearch-logging
+    k8s-app: elasticsearch-logging