diff --git a/stable/fluent-bit/Chart.yaml b/stable/fluent-bit/Chart.yaml
index cf2b5ad091..04867ea3db 100755
--- a/stable/fluent-bit/Chart.yaml
+++ b/stable/fluent-bit/Chart.yaml
@@ -1,5 +1,5 @@
 name: fluent-bit
-version: 0.7.0
+version: 0.8.0
 appVersion: 0.13.0
 description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX
 keywords:
diff --git a/stable/fluent-bit/templates/config.yaml b/stable/fluent-bit/templates/config.yaml
index fba85e59e7..737c7f9939 100644
--- a/stable/fluent-bit/templates/config.yaml
+++ b/stable/fluent-bit/templates/config.yaml
@@ -5,6 +5,9 @@ metadata:
   name: {{ template "fluent-bit.fullname" . }}-config
   labels:
     app: {{ template "fluent-bit.fullname" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
 data:
   fluent-bit.conf: |-
     [SERVICE]
diff --git a/stable/fluent-bit/templates/daemonset.yaml b/stable/fluent-bit/templates/daemonset.yaml
index edadfec2b3..214e98847b 100644
--- a/stable/fluent-bit/templates/daemonset.yaml
+++ b/stable/fluent-bit/templates/daemonset.yaml
@@ -4,6 +4,9 @@ metadata:
   name: fluent-bit
   labels:
     app: {{ template "fluent-bit.fullname" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
 spec:
   updateStrategy:
     type: RollingUpdate
@@ -11,6 +14,7 @@ spec:
     metadata:
       labels:
         app: {{ template "fluent-bit.fullname" . }}
+        release: {{ .Release.Name }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
 {{- if .Values.podAnnotations }}
diff --git a/stable/fluent-bit/templates/secret.yaml b/stable/fluent-bit/templates/secret.yaml
index 65f12c8208..527d828386 100644
--- a/stable/fluent-bit/templates/secret.yaml
+++ b/stable/fluent-bit/templates/secret.yaml
@@ -4,6 +4,9 @@ metadata:
   name: "{{ template "fluent-bit.fullname" . }}-es-tls-secret"
   labels:
     app: {{ template "fluent-bit.fullname" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
 type: Opaque
 data:
-  es-tls-ca.crt: {{ .Values.backend.es.tls_ca | b64enc | quote }}
\ No newline at end of file
+  es-tls-ca.crt: {{ .Values.backend.es.tls_ca | b64enc | quote }}
diff --git a/stable/fluent-bit/templates/service.yaml b/stable/fluent-bit/templates/service.yaml
index dcebf49181..24fe60aaa6 100644
--- a/stable/fluent-bit/templates/service.yaml
+++ b/stable/fluent-bit/templates/service.yaml
@@ -5,6 +5,9 @@ metadata:
   name: {{ template "fluent-bit.fullname" . }}-metrics
   labels:
     app: {{ template "fluent-bit.fullname" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
 spec:
   type: {{ .Values.metrics.service.type}}
   sessionAffinity: None
@@ -14,4 +17,5 @@ spec:
     name: metrics
   selector:
     app: {{ template "fluent-bit.fullname" . }}
+    release: {{ .Release.Name }}
 {{- end }}