diff --git a/filebeat/templates/daemonset.yaml b/filebeat/templates/daemonset.yaml
index 97d978efd..3168fafb7 100644
--- a/filebeat/templates/daemonset.yaml
+++ b/filebeat/templates/daemonset.yaml
@@ -34,6 +34,9 @@ spec:
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         heritage: {{ .Release.Service | quote }}
         release: {{ .Release.Name | quote }}
+        {{- range $key, $value := .Values.labels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
     spec:
       {{- with .Values.tolerations }}
       tolerations: {{ toYaml . | nindent 6 }}
diff --git a/filebeat/tests/filebeat_test.py b/filebeat/tests/filebeat_test.py
index 78741bf72..aa4518955 100644
--- a/filebeat/tests/filebeat_test.py
+++ b/filebeat/tests/filebeat_test.py
@@ -88,12 +88,12 @@ def test_override_the_default_update_strategy():
 
 def test_host_networking():
     config = '''
-hostNetworking: true    
+hostNetworking: true
 '''
     r = helm_template(config)
     assert r['daemonset'][name]['spec']['template']['spec']['hostNetwork'] is True
     config = '''
-hostNetworking: false    
+hostNetworking: false
 '''
     r = helm_template(config)
     assert 'hostNetwork' not in r['daemonset'][name]['spec']['template']['spec']
@@ -201,6 +201,7 @@ def test_adding_pod_labels():
 '''
     r = helm_template(config)
     assert r['daemonset'][name]['metadata']['labels']['app.kubernetes.io/name'] == 'filebeat'
+    assert r['daemonset'][name]['spec']['template']['metadata']['labels']['app.kubernetes.io/name'] == 'filebeat'
 
 
 def test_adding_a_node_selector():
diff --git a/kibana/templates/deployment.yaml b/kibana/templates/deployment.yaml
index 1a7866da1..d2bf9e783 100644
--- a/kibana/templates/deployment.yaml
+++ b/kibana/templates/deployment.yaml
@@ -21,6 +21,9 @@ spec:
       labels:
         app: kibana
         release: {{ .Release.Name | quote }}
+        {{- range $key, $value := .Values.labels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
       annotations:
         {{- range $key, $value := .Values.podAnnotations }}
         {{ $key }}: {{ $value | quote }}
diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py
index 385faf0f9..8404adb7e 100644
--- a/kibana/tests/kibana_test.py
+++ b/kibana/tests/kibana_test.py
@@ -380,6 +380,7 @@ def test_adding_pod_labels():
 '''
      r = helm_template(config)
      assert r['deployment'][name]['metadata']['labels']['app.kubernetes.io/name'] == 'kibana'
+     assert r['deployment'][name]['spec']['template']['metadata']['labels']['app.kubernetes.io/name'] == 'kibana'
 
 def test_adding_a_secret_mount_with_subpath():
     config = '''
diff --git a/logstash/templates/statefulset.yaml b/logstash/templates/statefulset.yaml
index d21e90bc7..f953ec890 100644
--- a/logstash/templates/statefulset.yaml
+++ b/logstash/templates/statefulset.yaml
@@ -42,6 +42,9 @@ spec:
         chart: "{{ .Chart.Name }}"
         heritage: {{ .Release.Service | quote }}
         release: {{ .Release.Name | quote }}
+        {{- range $key, $value := .Values.labels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
       annotations:
         {{- range $key, $value := .Values.podAnnotations }}
         {{ $key }}: {{ $value | quote }}
diff --git a/logstash/tests/logstash_test.py b/logstash/tests/logstash_test.py
index 33fb327f9..348fb3419 100755
--- a/logstash/tests/logstash_test.py
+++ b/logstash/tests/logstash_test.py
@@ -480,6 +480,7 @@ def test_adding_pod_labels():
 '''
     r = helm_template(config)
     assert r['statefulset'][name]['metadata']['labels']['app.kubernetes.io/name'] == 'logstash'
+    assert r['statefulset'][name]['spec']['template']['metadata']['labels']['app.kubernetes.io/name'] == 'logstash'
 
 
 def test_pod_security_policy():
diff --git a/metricbeat/templates/daemonset.yaml b/metricbeat/templates/daemonset.yaml
index 090af1355..6bc6441e3 100644
--- a/metricbeat/templates/daemonset.yaml
+++ b/metricbeat/templates/daemonset.yaml
@@ -34,6 +34,9 @@ spec:
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         heritage: {{ .Release.Service | quote }}
         release: {{ .Release.Name | quote }}
+        {{- range $key, $value := .Values.labels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
     spec:
       {{- with .Values.tolerations }}
       tolerations: {{ toYaml . | nindent 6 }}
diff --git a/metricbeat/tests/metricbeat_test.py b/metricbeat/tests/metricbeat_test.py
index f5fd7443e..6aec2c22e 100644
--- a/metricbeat/tests/metricbeat_test.py
+++ b/metricbeat/tests/metricbeat_test.py
@@ -238,6 +238,7 @@ def test_adding_pod_labels():
 '''
     r = helm_template(config)
     assert r['daemonset'][name]['metadata']['labels']['app.kubernetes.io/name'] == 'metricbeat'
+    assert r['daemonset'][name]['spec']['template']['metadata']['labels']['app.kubernetes.io/name'] == 'metricbeat'
 
 def test_setting_fullnameOverride():
     config = '''