diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
index 268f0e75d..503b3f1bb 100644
--- a/helm/templates/_helpers.tpl
+++ b/helm/templates/_helpers.tpl
@@ -118,20 +118,20 @@ Create chart name and version as used by the chart label.
 {{/*
 Common labels
 */}}
-{{- define "datatracker.labels" -}}
+{{- define "datatracker.commonLabels" -}}
 helm.sh/chart: {{ include "datatracker.chart" . }}
-{{ include "datatracker.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ include "datatracker.name" . | default "datatracker" }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
 {{- define "datatracker.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "datatracker.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
diff --git a/helm/templates/deployments/beat.yaml b/helm/templates/deployments/beat.yaml
index 6f7409fb9..83347481c 100644
--- a/helm/templates/deployments/beat.yaml
+++ b/helm/templates/deployments/beat.yaml
@@ -3,7 +3,8 @@ kind: Deployment
 metadata:
   name: {{ include "datatracker.beat.fullname" . }}
   labels:
-    {{- include "datatracker.labels" . | nindent 4 }}
+    {{- include "datatracker.commonLabels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ .Values.beat.name }}
 spec:
   {{- $podValues := .Values.beat }}
   replicas: {{ $podValues.replicaCount }}
@@ -11,10 +12,12 @@ spec:
   selector:
     matchLabels:
       {{- include "datatracker.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: {{ $podValues.name }}
   template:
     metadata:
       labels:
         {{- include "datatracker.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/name: {{ $podValues.name }}
     spec:
     {{- with $podValues.imagePullSecrets }}
       imagePullSecrets:
diff --git a/helm/templates/deployments/celery.yaml b/helm/templates/deployments/celery.yaml
index f1f043abb..1fb176009 100644
--- a/helm/templates/deployments/celery.yaml
+++ b/helm/templates/deployments/celery.yaml
@@ -3,7 +3,8 @@ kind: Deployment
 metadata:
   name: {{ include "datatracker.celery.fullname" . }}
   labels:
-    {{- include "datatracker.labels" . | nindent 4 }}
+    {{- include "datatracker.commonLabels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ .Values.celery.name }}
 spec:
   {{- $podValues := .Values.celery }}
   replicas: {{ $podValues.replicaCount }}
@@ -11,10 +12,12 @@ spec:
   selector:
     matchLabels:
       {{- include "datatracker.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: {{ $podValues.name }}
   template:
     metadata:
       labels:
         {{- include "datatracker.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/name: {{ $podValues.name }}
     spec:
     {{- with $podValues.imagePullSecrets }}
       imagePullSecrets:
diff --git a/helm/templates/deployments/datatracker.yaml b/helm/templates/deployments/datatracker.yaml
index dd4d8e4d8..0cc5ab617 100644
--- a/helm/templates/deployments/datatracker.yaml
+++ b/helm/templates/deployments/datatracker.yaml
@@ -3,7 +3,8 @@ kind: Deployment
 metadata:
   name: {{ include "datatracker.datatracker.fullname" . }}
   labels:
-    {{- include "datatracker.labels" . | nindent 4 }}
+    {{- include "datatracker.commonLabels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ .Values.datatracker.name }}
 spec:
   {{- $podValues := .Values.datatracker }}
   replicas: {{ $podValues.replicaCount }}
@@ -11,10 +12,12 @@ spec:
   selector:
     matchLabels:
       {{- include "datatracker.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: {{ $podValues.name }}
   template:
     metadata:
       labels:
         {{- include "datatracker.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/name: {{ $podValues.name }}
     spec:
     {{- with $podValues.imagePullSecrets }}
       imagePullSecrets:
diff --git a/helm/templates/deployments/memcached.yaml b/helm/templates/deployments/memcached.yaml
index cbc7b3c35..4bc35927d 100644
--- a/helm/templates/deployments/memcached.yaml
+++ b/helm/templates/deployments/memcached.yaml
@@ -3,7 +3,8 @@ kind: Deployment
 metadata:
   name: {{ include "datatracker.memcached.fullname" . }}
   labels:
-    {{- include "datatracker.labels" . | nindent 4 }}
+    {{- include "datatracker.commonLabels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ .Values.memcached.name }}
 spec:
   {{- $podValues := .Values.memcached }}
   replicas: {{ $podValues.replicaCount }}
@@ -11,10 +12,12 @@ spec:
   selector:
     matchLabels:
       {{- include "datatracker.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: {{ $podValues.name }}
   template:
     metadata:
       labels:
         {{- include "datatracker.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/name: {{ $podValues.name }}
     spec:
     {{- with $podValues.imagePullSecrets }}
       imagePullSecrets:
diff --git a/helm/templates/hpa.yaml b/helm/templates/hpa.yaml
index 5dd889b50..646000bdc 100644
--- a/helm/templates/hpa.yaml
+++ b/helm/templates/hpa.yaml
@@ -4,7 +4,7 @@ kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "datatracker.fullname" . }}
   labels:
-    {{- include "datatracker.labels" . | nindent 4 }}
+    {{- include "datatracker.commonLabels" . | nindent 4 }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
@@ -29,4 +29,4 @@ spec:
           type: Utilization
           averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml
index c9405ef38..3b1a9febc 100644
--- a/helm/templates/ingress.yaml
+++ b/helm/templates/ingress.yaml
@@ -17,7 +17,7 @@ kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-    {{- include "datatracker.labels" . | nindent 4 }}
+    {{- include "datatracker.commonLabels" . | nindent 4 }}
   {{- with .Values.datatracker.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/helm/templates/rbac/beat-serviceaccount.yaml b/helm/templates/rbac/beat-serviceaccount.yaml
index bd955aed8..983401375 100644
--- a/helm/templates/rbac/beat-serviceaccount.yaml
+++ b/helm/templates/rbac/beat-serviceaccount.yaml
@@ -4,7 +4,7 @@ kind: ServiceAccount
 metadata:
   name: {{ include "datatracker.serviceAccountName.beat" . }}
   labels:
-    {{- include "datatracker.labels" . | nindent 4 }}
+    {{- include "datatracker.commonLabels" . | nindent 4 }}
   {{- with .Values.serviceAccounts.beat.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/helm/templates/rbac/celery-serviceaccount.yaml b/helm/templates/rbac/celery-serviceaccount.yaml
index 105b979c6..e27673e38 100644
--- a/helm/templates/rbac/celery-serviceaccount.yaml
+++ b/helm/templates/rbac/celery-serviceaccount.yaml
@@ -4,7 +4,7 @@ kind: ServiceAccount
 metadata:
   name: {{ include "datatracker.serviceAccountName.celery" . }}
   labels:
-    {{- include "datatracker.labels" . | nindent 4 }}
+    {{- include "datatracker.commonLabels" . | nindent 4 }}
   {{- with .Values.serviceAccounts.celery.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/helm/templates/rbac/datatracker-serviceaccount.yaml b/helm/templates/rbac/datatracker-serviceaccount.yaml
index 7786443ad..d64f1523d 100644
--- a/helm/templates/rbac/datatracker-serviceaccount.yaml
+++ b/helm/templates/rbac/datatracker-serviceaccount.yaml
@@ -4,7 +4,7 @@ kind: ServiceAccount
 metadata:
   name: {{ include "datatracker.serviceAccountName.datatracker" . }}
   labels:
-    {{- include "datatracker.labels" . | nindent 4 }}
+    {{- include "datatracker.commonLabels" . | nindent 4 }}
   {{- with .Values.serviceAccounts.datatracker.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/helm/templates/rbac/memcached-serviceaccount.yaml b/helm/templates/rbac/memcached-serviceaccount.yaml
index 7f01615b1..cc8d1a121 100644
--- a/helm/templates/rbac/memcached-serviceaccount.yaml
+++ b/helm/templates/rbac/memcached-serviceaccount.yaml
@@ -4,7 +4,7 @@ kind: ServiceAccount
 metadata:
   name: {{ include "datatracker.serviceAccountName.memcached" . }}
   labels:
-    {{- include "datatracker.labels" . | nindent 4 }}
+    {{- include "datatracker.commonLabels" . | nindent 4 }}
   {{- with .Values.serviceAccounts.memcached.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/helm/templates/rbac/rabbitmq-serviceaccount.yaml b/helm/templates/rbac/rabbitmq-serviceaccount.yaml
index 015e098da..58c89b2dc 100644
--- a/helm/templates/rbac/rabbitmq-serviceaccount.yaml
+++ b/helm/templates/rbac/rabbitmq-serviceaccount.yaml
@@ -4,7 +4,7 @@ kind: ServiceAccount
 metadata:
   name: {{ include "datatracker.serviceAccountName.rabbitmq" . }}
   labels:
-    {{- include "datatracker.labels" . | nindent 4 }}
+    {{- include "datatracker.commonLabels" . | nindent 4 }}
   {{- with .Values.serviceAccounts.rabbitmq.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/helm/templates/services/datatracker.yaml b/helm/templates/services/datatracker.yaml
index 2fbea5826..201f5a3b4 100644
--- a/helm/templates/services/datatracker.yaml
+++ b/helm/templates/services/datatracker.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{include "datatracker.fullname" .}}
-  labels: {{- include "datatracker.labels" . | nindent 4 }}
+  labels: {{- include "datatracker.commonLabels" . | nindent 4 }}
   {{- with .Values.datatracker.service.annotations }}
   annotations:
     {{- range $key, $value := . }}
@@ -16,4 +16,6 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
-  selector: {{- include "datatracker.selectorLabels" . | nindent 4}}
\ No newline at end of file
+  selector:
+    {{- include "datatracker.selectorLabels" . | nindent 4}}
+    app.kubernetes.io/name: {{ .Values.datatracker.name }}
diff --git a/helm/templates/services/memcached.yaml b/helm/templates/services/memcached.yaml
index 1337571b0..572c382b5 100644
--- a/helm/templates/services/memcached.yaml
+++ b/helm/templates/services/memcached.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: memcached
-  labels: {{- include "datatracker.labels" . | nindent 4 }}
+  labels: {{- include "datatracker.commonLabels" . | nindent 4 }}
   {{- with .Values.memcached.service.annotations }}
   annotations:
     {{- range $key, $value := . }}
@@ -16,4 +16,6 @@ spec:
       targetPort: memcached
       protocol: TCP
       name: memcached
-  selector: {{- include "datatracker.selectorLabels" . | nindent 4}}
+  selector: 
+    {{- include "datatracker.selectorLabels" . | nindent 4}}
+    app.kubernetes.io/name: {{ .Values.memcached.name }}
diff --git a/helm/templates/services/rabbitmq.yaml b/helm/templates/services/rabbitmq.yaml
index a23c4eaef..e67cb3169 100644
--- a/helm/templates/services/rabbitmq.yaml
+++ b/helm/templates/services/rabbitmq.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: rabbitmq
-  labels: {{- include "datatracker.labels" . | nindent 4 }}
+  labels: {{- include "datatracker.commonLabels" . | nindent 4 }}
   {{- with .Values.rabbitmq.service.annotations }}
   annotations:
     {{- range $key, $value := . }}
@@ -17,4 +17,6 @@ spec:
       targetPort: amqp
       protocol: TCP
       name: amqp
-  selector: {{- include "datatracker.selectorLabels" . | nindent 4}}
+  selector:
+    {{- include "datatracker.selectorLabels" . | nindent 4}}
+    app.kubernetes.io/name: {{ .Values.rabbitmq.name }}
diff --git a/helm/templates/statefulsets/rabbitmq.yaml b/helm/templates/statefulsets/rabbitmq.yaml
index cad4f1650..dcffe1767 100644
--- a/helm/templates/statefulsets/rabbitmq.yaml
+++ b/helm/templates/statefulsets/rabbitmq.yaml
@@ -3,7 +3,8 @@ kind: StatefulSet
 metadata:
   name: {{ include "datatracker.rabbitmq.fullname" . }}
   labels:
-    {{- include "datatracker.labels" . | nindent 4 }}
+    {{- include "datatracker.commonLabels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ .Values.rabbitmq.name }}
 spec:
   {{- $podValues := .Values.rabbitmq }}
   replicas: {{ $podValues.replicaCount }}
@@ -11,10 +12,12 @@ spec:
   selector:
     matchLabels:
       {{- include "datatracker.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: {{ $podValues.name }}
   template:
     metadata:
       labels:
         {{- include "datatracker.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/name: {{ $podValues.name }}
     spec:
     {{- with $podValues.imagePullSecrets }}
       imagePullSecrets:
diff --git a/helm/values.yaml b/helm/values.yaml
index 27094f546..6e79be5e8 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -218,10 +218,6 @@ celery:
     # runAsNonRoot: true
     # runAsUser: 1000
 
-  service:
-    type: ClusterIP
-    port: 80
-
   serviceAccount:
     # Specifies whether a service account should be created
     create: true
@@ -336,10 +332,6 @@ beat:
     # runAsNonRoot: true
     # runAsUser: 1000
 
-  service:
-    type: ClusterIP
-    port: 80
-
   serviceAccount:
     # Specifies whether a service account should be created
     create: true