diff --git a/kibana/templates/deployment.yaml b/kibana/templates/deployment.yaml
index ad563b3f2..73cb992ca 100644
--- a/kibana/templates/deployment.yaml
+++ b/kibana/templates/deployment.yaml
@@ -14,12 +14,12 @@ spec:
 {{ toYaml .Values.updateStrategy | indent 4 }}
   selector:
     matchLabels:
-      app: kibana
+      app: {{ .Chart.Name }}
       release: {{ .Release.Name | quote }}
   template:
     metadata:
       labels:
-        app: kibana
+        app: {{ .Chart.Name }}
         release: {{ .Release.Name | quote }}
         {{- range $key, $value := .Values.labels }}
         {{ $key }}: {{ $value | quote }}
diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py
index 1d43bef69..4b864f2f0 100644
--- a/kibana/tests/kibana_test.py
+++ b/kibana/tests/kibana_test.py
@@ -515,6 +515,31 @@ def test_adding_pod_labels():
     )
 
 
+def test_service_to_pod_label_selectors():
+    config = ""
+
+    r = helm_template(config)
+
+    assert all(
+        l in r["deployment"][name]["spec"]["template"]["metadata"]["labels"].items()
+        for l in r["service"][name]["spec"]["selector"].items()
+    )
+
+
+def test_service_to_pod_label_selectors_with_custom_labels():
+    config = """
+labels:
+  app.kubernetes.io/name: kibana
+"""
+
+    r = helm_template(config)
+
+    assert all(
+        l in r["deployment"][name]["spec"]["template"]["metadata"]["labels"].items()
+        for l in r["service"][name]["spec"]["selector"].items()
+    )
+
+
 def test_adding_a_secret_mount_with_subpath():
     config = """
 secretMounts: