diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in b/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in
index ebad3bab2ff..d5f02db7766 100644
--- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in
+++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in
@@ -27,6 +27,7 @@ desiredState:
               emptyDir: {}
     labels:
       name: elasticsearch-logging
+      kubernetes.io/cluster-service: "true"
 labels:
   name: elasticsearch-logging
- 
\ No newline at end of file
+  kubernetes.io/cluster-service: "true"
diff --git a/cluster/addons/fluentd-elasticsearch/es-service.yaml b/cluster/addons/fluentd-elasticsearch/es-service.yaml
index 128089b1be0..3fd9d2c21f6 100644
--- a/cluster/addons/fluentd-elasticsearch/es-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-service.yaml
@@ -5,6 +5,7 @@ containerPort: es-port
 port: 9200
 labels:
   name: elasticsearch-logging
+  kubernetes.io/cluster-service: "true"
 selector:
   name: elasticsearch-logging
 createExternalLoadBalancer: true
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
index ef71886b9ad..dfd7adc7a32 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
@@ -18,5 +18,7 @@ desiredState:
                 containerPort: 80
     labels:
       name: kibana-logging
+      kubernetes.io/cluster-service: "true"
 labels:
   name: kibana-logging
+  kubernetes.io/cluster-service: "true"
\ No newline at end of file
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
index d4ef4aa958c..1af5df263ed 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
@@ -5,6 +5,7 @@ containerPort: kibana-port
 port: 5601
 labels:
   name: kibana-logging
+  kubernetes.io/cluster-service: "true"
 selector:
   name: kibana-logging
 createExternalLoadBalancer: true