diff --git a/apm-server/templates/deployment.yaml b/apm-server/templates/deployment.yaml
index fa87cfa5a..9ab2ef1f5 100644
--- a/apm-server/templates/deployment.yaml
+++ b/apm-server/templates/deployment.yaml
@@ -21,6 +21,9 @@ spec:
       labels:
         app: apm-server
         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/apm-server/tests/apmserver_test.py b/apm-server/tests/apmserver_test.py
index d60007f3e..ce5e17aea 100644
--- a/apm-server/tests/apmserver_test.py
+++ b/apm-server/tests/apmserver_test.py
@@ -268,7 +268,9 @@ def test_adding_pod_labels():
 """
     r = helm_template(config)
     assert (
-        r["deployment"][name]["metadata"]["labels"]["app.kubernetes.io/name"]
+        r["deployment"][name]["spec"]["template"]["metadata"]["labels"][
+            "app.kubernetes.io/name"
+        ]
         == "apm-server"
     )