diff --git a/elastic-apm-server/templates/deployment.yaml b/elastic-apm-server/templates/deployment.yaml
index 7e037d3fb..f94916828 100644
--- a/elastic-apm-server/templates/deployment.yaml
+++ b/elastic-apm-server/templates/deployment.yaml
@@ -54,7 +54,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: elastic-apm-server
+  labels:
+{{ tuple $envAll "elastic-apm-server" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
+  selector:
+    matchLabels:
+{{ tuple $envAll "elastic-apm-server" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
 {{ tuple $envAll "elastic-apm-server" | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
   template:
     metadata:
diff --git a/elastic-packetbeat/templates/daemonset.yaml b/elastic-packetbeat/templates/daemonset.yaml
index bde34b3f3..a3d167ad9 100644
--- a/elastic-packetbeat/templates/daemonset.yaml
+++ b/elastic-packetbeat/templates/daemonset.yaml
@@ -77,6 +77,9 @@ kind: DaemonSet
 metadata:
   name: packetbeat
 spec:
+  selector:
+    matchLabels:
+{{ tuple $envAll "packetbeat" "daemon" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
 {{ tuple $envAll "packetbeat" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
   template:
     metadata: