diff --git a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml
index 7964aae8dbe..af48182363e 100644
--- a/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-statefulset.yaml
@@ -6,7 +6,6 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: elasticsearch-logging
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 ---
 kind: ClusterRole
@@ -15,7 +14,6 @@ metadata:
   name: elasticsearch-logging
   labels:
     k8s-app: elasticsearch-logging
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 rules:
 - apiGroups:
@@ -34,7 +32,6 @@ metadata:
   name: elasticsearch-logging
   labels:
     k8s-app: elasticsearch-logging
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 subjects:
 - kind: ServiceAccount
@@ -55,7 +52,6 @@ metadata:
   labels:
     k8s-app: elasticsearch-logging
     version: v6.6.1
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   serviceName: elasticsearch-logging
@@ -69,7 +65,6 @@ spec:
       labels:
         k8s-app: elasticsearch-logging
         version: v6.6.1
-        kubernetes.io/cluster-service: "true"
     spec:
       serviceAccountName: elasticsearch-logging
       containers:
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
index 4aad9e20584..f39ac46f044 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
@@ -5,7 +5,6 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: fluentd-es
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 ---
 kind: ClusterRole
@@ -14,7 +13,6 @@ metadata:
   name: fluentd-es
   labels:
     k8s-app: fluentd-es
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 rules:
 - apiGroups:
@@ -33,7 +31,6 @@ metadata:
   name: fluentd-es
   labels:
     k8s-app: fluentd-es
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 subjects:
 - kind: ServiceAccount
@@ -53,7 +50,6 @@ metadata:
   labels:
     k8s-app: fluentd-es
     version: v2.5.1
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   selector:
@@ -64,7 +60,6 @@ spec:
     metadata:
       labels:
         k8s-app: fluentd-es
-        kubernetes.io/cluster-service: "true"
         version: v2.5.1
       # This annotation ensures that fluentd does not get evicted if the node
       # supports critical pod annotation based priority scheme.
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml b/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml
index 67f541b3ae8..d1580bfd6b1 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml
@@ -5,7 +5,6 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: kibana-logging
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1
diff --git a/cluster/addons/fluentd-elasticsearch/podsecuritypolicies/es-psp-binding.yaml b/cluster/addons/fluentd-elasticsearch/podsecuritypolicies/es-psp-binding.yaml
index fbe06861ce7..4960f315447 100644
--- a/cluster/addons/fluentd-elasticsearch/podsecuritypolicies/es-psp-binding.yaml
+++ b/cluster/addons/fluentd-elasticsearch/podsecuritypolicies/es-psp-binding.yaml
@@ -5,7 +5,6 @@ metadata:
   namespace: kube-system
   labels:
     addonmanager.kubernetes.io/mode: Reconcile
-    kubernetes.io/cluster-service: "true"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole