diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
index 672197a8de4..d4aeb65d86f 100644
--- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
@@ -2,17 +2,20 @@ apiVersion: v1beta3
 kind: ReplicationController
 metadata:
   labels:
-    name: elasticsearch-logging
+    app: elasticsearch-logging
+    version: v1
     kubernetes.io/cluster-service: "true"
   name: elasticsearch-logging
 spec:
   replicas: 2
   selector:
-    name: elasticsearch-logging
+    app: elasticsearch-logging
+    version: v1
   template:
     metadata:
       labels:
-        name: elasticsearch-logging
+        app: elasticsearch-logging
+        version: v1
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
diff --git a/cluster/addons/fluentd-elasticsearch/es-service.yaml b/cluster/addons/fluentd-elasticsearch/es-service.yaml
index 21f05b6b240..9d923b7ce2c 100644
--- a/cluster/addons/fluentd-elasticsearch/es-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1beta3
 kind: Service
 metadata:
   labels:
-    name: elasticsearch-logging
+    app: elasticsearch-logging
     kubernetes.io/cluster-service: "true"
     kubernetes.io/name: "Elasticsearch"
   name: elasticsearch-logging
@@ -12,4 +12,4 @@ spec:
     protocol: TCP
     targetPort: es-port
   selector:
-    name: elasticsearch-logging
+    app: elasticsearch-logging