diff --git a/stable/filebeat/Chart.yaml b/stable/filebeat/Chart.yaml
index 5389ad8fc3..20a2c26a1b 100644
--- a/stable/filebeat/Chart.yaml
+++ b/stable/filebeat/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: A Helm chart to collect Kubernetes logs with filebeat
 icon: https://www.elastic.co/assets/blt47799dcdcf08438d/logo-elastic-beats-lt.svg
 name: filebeat
-version: 2.0.2
+version: 3.0.0
 appVersion: 7.0.1
 home: https://www.elastic.co/products/beats/filebeat
 sources:
diff --git a/stable/filebeat/templates/clusterrole.yaml b/stable/filebeat/templates/clusterrole.yaml
index 5883e7d89a..93894db035 100644
--- a/stable/filebeat/templates/clusterrole.yaml
+++ b/stable/filebeat/templates/clusterrole.yaml
@@ -4,10 +4,10 @@ kind: ClusterRole
 metadata:
   name: {{ template "filebeat.fullname" . }}
   labels:
-    app: {{ template "filebeat.name" . }}
-    chart: {{ template "filebeat.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ template "filebeat.name" . }}
+    helm.sh/chart: {{ template "filebeat.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 rules:
 - apiGroups: [""]
   resources:
diff --git a/stable/filebeat/templates/clusterrolebinding.yaml b/stable/filebeat/templates/clusterrolebinding.yaml
index 19a25c0ddc..8e7bc85f2b 100644
--- a/stable/filebeat/templates/clusterrolebinding.yaml
+++ b/stable/filebeat/templates/clusterrolebinding.yaml
@@ -4,10 +4,10 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ template "filebeat.fullname" . }}
   labels:
-    app: {{ template "filebeat.name" . }}
-    chart: {{ template "filebeat.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ template "filebeat.name" . }}
+    helm.sh/chart: {{ template "filebeat.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/stable/filebeat/templates/daemonset.yaml b/stable/filebeat/templates/daemonset.yaml
index 8bf11057ff..6aed90325b 100644
--- a/stable/filebeat/templates/daemonset.yaml
+++ b/stable/filebeat/templates/daemonset.yaml
@@ -3,15 +3,15 @@ kind: DaemonSet
 metadata:
   name: {{ template "filebeat.fullname" . }}
   labels:
-    app: {{ template "filebeat.name" . }}
-    chart: {{ template "filebeat.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ template "filebeat.name" . }}
+    helm.sh/chart: {{ template "filebeat.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   selector:
     matchLabels:
-      app: {{ template "filebeat.name" . }}
-      release: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ template "filebeat.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
   minReadySeconds: 10
   updateStrategy:
     type: RollingUpdate
@@ -20,8 +20,8 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "filebeat.name" . }}
-        release: {{ .Release.Name }}
+        app.kubernetes.io/name: {{ template "filebeat.name" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
       annotations:
         checksum/secret: {{ toYaml (default .Values.config .Values.overrideConfig) | sha256sum }}
 {{- if .Values.annotations }}
diff --git a/stable/filebeat/templates/role.yaml b/stable/filebeat/templates/role.yaml
index 93cb69ab8b..2ce648fb6d 100644
--- a/stable/filebeat/templates/role.yaml
+++ b/stable/filebeat/templates/role.yaml
@@ -5,10 +5,10 @@ kind: Role
 metadata:
   name: {{ template "filebeat.fullname" . }}
   labels:
-    app: {{ template "filebeat.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "filebeat.name" . }}
+    helm.sh/chart: {{ template "filebeat.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
   namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups: ['extensions']
diff --git a/stable/filebeat/templates/rolebinding.yaml b/stable/filebeat/templates/rolebinding.yaml
index 4eca983f3e..15d5476a49 100644
--- a/stable/filebeat/templates/rolebinding.yaml
+++ b/stable/filebeat/templates/rolebinding.yaml
@@ -5,10 +5,10 @@ kind: RoleBinding
 metadata:
   name: {{ template "filebeat.fullname" . }}
   labels:
-    app: {{ template "filebeat.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ template "filebeat.name" . }}
+    helm.sh/chart: {{ template "filebeat.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
   namespace: {{ .Release.Namespace }}
 roleRef:
   kind: Role
diff --git a/stable/filebeat/templates/secret.yaml b/stable/filebeat/templates/secret.yaml
index 246ecd0e69..6ca25b0dff 100644
--- a/stable/filebeat/templates/secret.yaml
+++ b/stable/filebeat/templates/secret.yaml
@@ -3,10 +3,10 @@ kind: Secret
 metadata:
   name: {{ template "filebeat.fullname" . }}
   labels:
-    app: {{ template "filebeat.name" . }}
-    chart: {{ template "filebeat.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ template "filebeat.name" . }}
+    helm.sh/chart: {{ template "filebeat.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:
   filebeat.yml: {{ toYaml (default .Values.config .Values.overrideConfig) | indent 4 | b64enc }}
diff --git a/stable/filebeat/templates/service.yaml b/stable/filebeat/templates/service.yaml
index b42fb258a3..8f99263ab6 100644
--- a/stable/filebeat/templates/service.yaml
+++ b/stable/filebeat/templates/service.yaml
@@ -15,13 +15,14 @@ metadata:
   name: {{ template "filebeat.fullname" . }}-metrics
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "filebeat.name" . }}
-    chart: {{ template "filebeat.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ template "filebeat.name" . }}
+    helm.sh/chart: {{ template "filebeat.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   selector:
-    app: {{ template "filebeat.name" . }}
+    app.kubernetes.io/name: {{ template "filebeat.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
   ports:
     - name: metrics
       port: {{ .Values.monitoring.exporterPort }}
diff --git a/stable/filebeat/templates/serviceaccount.yaml b/stable/filebeat/templates/serviceaccount.yaml
index 7de907b363..5c5af0a95a 100644
--- a/stable/filebeat/templates/serviceaccount.yaml
+++ b/stable/filebeat/templates/serviceaccount.yaml
@@ -4,8 +4,8 @@ kind: ServiceAccount
 metadata:
   name: {{ template "filebeat.serviceAccountName" . }}
   labels:
-    app: {{ template "filebeat.name" . }}
-    chart: {{ template "filebeat.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ template "filebeat.name" . }}
+    helm.sh/chart: {{ template "filebeat.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
diff --git a/stable/filebeat/templates/servicemonitor.yaml b/stable/filebeat/templates/servicemonitor.yaml
index 6eb5ff1950..579c4588b3 100644
--- a/stable/filebeat/templates/servicemonitor.yaml
+++ b/stable/filebeat/templates/servicemonitor.yaml
@@ -25,6 +25,6 @@ spec:
     - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app: {{ template "filebeat.name" . }}
-      release: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ template "filebeat.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
\ No newline at end of file