diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md
index 09226cf8c..34245cc12 100644
--- a/charts/jenkins/CHANGELOG.md
+++ b/charts/jenkins/CHANGELOG.md
@@ -12,6 +12,12 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
 The changelog until v1.5.7 was auto-generated based on git commits.
 Those entries include a reference to the git commit to be able to get more details.
 
+## 4.3.29
+
+Adding common labels helper
+Adding additional labels app.kubernetes.io/part-of and app.kubernetes.io/version
+Include jenkins.commonlabels across resources
+
 ## 4.3.28
 
 Allow the kubernetes API server URL to be configurable.
diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
index b35dd81c0..305a9cf05 100644
--- a/charts/jenkins/Chart.yaml
+++ b/charts/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: jenkins
 home: https://jenkins.io/
-version: 4.3.28
+version: 4.3.29
 appVersion: 2.401.1
 description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project.
 sources:
diff --git a/charts/jenkins/templates/_helpers.tpl b/charts/jenkins/templates/_helpers.tpl
index a50f4dd62..85bb03075 100644
--- a/charts/jenkins/templates/_helpers.tpl
+++ b/charts/jenkins/templates/_helpers.tpl
@@ -15,6 +15,20 @@ Expand the label of the chart.
 
 
 {{/*
+Common labels
+*/}}
+{{- define "jenkins.commonlabels" -}}
+app.kubernetes.io/name: {{ .Chart.Name }}
+{{- if .Values.renderHelmLabels }}
+helm.sh/chart: {{ template "jenkins.label" .}}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/part-of: {{ .Chart.Name }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/version: {{ include "controller.tag" . }}
+{{- end -}}
+
+{{/*s
 Allow the release namespace to be overridden for multi-namespace deployments in combined charts.
 */}}
 {{- define "jenkins.namespace" -}}
diff --git a/charts/jenkins/templates/config-init-scripts.yaml b/charts/jenkins/templates/config-init-scripts.yaml
index 7dd253cc3..20d8839bf 100644
--- a/charts/jenkins/templates/config-init-scripts.yaml
+++ b/charts/jenkins/templates/config-init-scripts.yaml
@@ -6,9 +6,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}-init-scripts
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 data:
 {{- range $key, $val := .Values.controller.initScripts }}
diff --git a/charts/jenkins/templates/config.yaml b/charts/jenkins/templates/config.yaml
index b94c79f5d..ee800db60 100644
--- a/charts/jenkins/templates/config.yaml
+++ b/charts/jenkins/templates/config.yaml
@@ -6,9 +6,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 data:
   apply_config.sh: |-
diff --git a/charts/jenkins/templates/home-pvc.yaml b/charts/jenkins/templates/home-pvc.yaml
index af17f7c17..4813c2402 100644
--- a/charts/jenkins/templates/home-pvc.yaml
+++ b/charts/jenkins/templates/home-pvc.yaml
@@ -10,12 +10,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 {{- if .Values.persistence.labels }}
 {{ toYaml .Values.persistence.labels | indent 4 }}
diff --git a/charts/jenkins/templates/jcasc-config.yaml b/charts/jenkins/templates/jcasc-config.yaml
index 684c985ab..c096e0341 100644
--- a/charts/jenkins/templates/jcasc-config.yaml
+++ b/charts/jenkins/templates/jcasc-config.yaml
@@ -9,12 +9,7 @@ metadata:
   name: {{ template "jenkins.casc.configName" (list (printf "config-%s" $key) $ )}}
   namespace: {{ template "jenkins.namespace" $root }}
   labels:
-    "app.kubernetes.io/name": {{ template "jenkins.name" $root}}
-    {{- if $root.Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ $root.Chart.Name }}-{{ $root.Chart.Version }}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ $.Release.Service }}"
-    "app.kubernetes.io/instance": "{{ $.Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ $.Values.controller.componentName }}"
     {{ template "jenkins.fullname" $root }}-jenkins-config: "true"
 data:
@@ -30,12 +25,7 @@ metadata:
   name: {{ template "jenkins.casc.configName" (list "jcasc-config" $ )}}
   namespace: {{ template "jenkins.namespace" $root }}
   labels:
-    "app.kubernetes.io/name": {{ template "jenkins.name" $root}}
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ $root.Chart.Name }}-{{ $root.Chart.Version }}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ $.Release.Service }}"
-    "app.kubernetes.io/instance": "{{ $.Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ $.Values.controller.componentName }}"
     {{ template "jenkins.fullname" $root }}-jenkins-config: "true"
 data:
diff --git a/charts/jenkins/templates/jenkins-agent-svc.yaml b/charts/jenkins/templates/jenkins-agent-svc.yaml
index 4440b91f8..bcaf45a2b 100644
--- a/charts/jenkins/templates/jenkins-agent-svc.yaml
+++ b/charts/jenkins/templates/jenkins-agent-svc.yaml
@@ -5,12 +5,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}-agent
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
   {{- if .Values.controller.agentListenerServiceAnnotations }}
   annotations:
diff --git a/charts/jenkins/templates/jenkins-backup-cronjob.yaml b/charts/jenkins/templates/jenkins-backup-cronjob.yaml
index d710dd5e5..2ae1cf56c 100644
--- a/charts/jenkins/templates/jenkins-backup-cronjob.yaml
+++ b/charts/jenkins/templates/jenkins-backup-cronjob.yaml
@@ -5,12 +5,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}-backup
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.backup.componentName }}"
 spec:
   schedule: {{ .Values.backup.schedule | quote }}
diff --git a/charts/jenkins/templates/jenkins-backup-rbac.yaml b/charts/jenkins/templates/jenkins-backup-rbac.yaml
index 0f94fa833..6737f4506 100644
--- a/charts/jenkins/templates/jenkins-backup-rbac.yaml
+++ b/charts/jenkins/templates/jenkins-backup-rbac.yaml
@@ -6,12 +6,7 @@ metadata:
   name: {{ include "backup.serviceAccountBackupName" . }}
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
   {{- if .Values.backup.serviceAccount.annotations }}
   annotations:
@@ -25,12 +20,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}-backup
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 rules:
 - apiGroups: [""]
@@ -46,12 +36,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}-backup
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/charts/jenkins/templates/jenkins-controller-alerting-rules.yaml b/charts/jenkins/templates/jenkins-controller-alerting-rules.yaml
index 3fd806172..7a311ee8c 100644
--- a/charts/jenkins/templates/jenkins-controller-alerting-rules.yaml
+++ b/charts/jenkins/templates/jenkins-controller-alerting-rules.yaml
@@ -10,12 +10,7 @@ metadata:
   namespace: {{ template "jenkins.namespace" . }}
 {{- end }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
     {{- range $key, $val := .Values.controller.prometheus.alertingRulesAdditionalLabels }}
     {{ $key }}: {{ $val | quote }}
diff --git a/charts/jenkins/templates/jenkins-controller-backendconfig.yaml b/charts/jenkins/templates/jenkins-controller-backendconfig.yaml
index 0e8a566fc..dcfe843e9 100644
--- a/charts/jenkins/templates/jenkins-controller-backendconfig.yaml
+++ b/charts/jenkins/templates/jenkins-controller-backendconfig.yaml
@@ -5,12 +5,7 @@ metadata:
   name: {{ .Values.controller.backendconfig.name }}
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 {{- if .Values.controller.backendconfig.labels }}
 {{ toYaml .Values.controller.backendconfig.labels | indent 4 }}
diff --git a/charts/jenkins/templates/jenkins-controller-ingress.yaml b/charts/jenkins/templates/jenkins-controller-ingress.yaml
index e7b6c6fd3..adaacbb2a 100644
--- a/charts/jenkins/templates/jenkins-controller-ingress.yaml
+++ b/charts/jenkins/templates/jenkins-controller-ingress.yaml
@@ -11,12 +11,7 @@ kind: Ingress
 metadata:
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 {{- if .Values.controller.ingress.labels }}
 {{ toYaml .Values.controller.ingress.labels | indent 4 }}
diff --git a/charts/jenkins/templates/jenkins-controller-networkpolicy.yaml b/charts/jenkins/templates/jenkins-controller-networkpolicy.yaml
index 91cf6db11..c8aaee06a 100644
--- a/charts/jenkins/templates/jenkins-controller-networkpolicy.yaml
+++ b/charts/jenkins/templates/jenkins-controller-networkpolicy.yaml
@@ -5,12 +5,7 @@ metadata:
   name: "{{ .Release.Name }}-{{ .Values.controller.componentName }}"
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 spec:
   podSelector:
@@ -60,12 +55,7 @@ metadata:
   name: "{{ .Release.Name }}-{{ .Values.agent.componentName }}"
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 spec:
   podSelector:
diff --git a/charts/jenkins/templates/jenkins-controller-pdb.yaml b/charts/jenkins/templates/jenkins-controller-pdb.yaml
index 9dc1fafe2..49d88445f 100644
--- a/charts/jenkins/templates/jenkins-controller-pdb.yaml
+++ b/charts/jenkins/templates/jenkins-controller-pdb.yaml
@@ -12,12 +12,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}-pdb
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
     {{- if .Values.controller.podDisruptionBudget.labels -}}
     {{ toYaml .Values.controller.podDisruptionBudget.labels | nindent 4 }}
diff --git a/charts/jenkins/templates/jenkins-controller-podmonitor.yaml b/charts/jenkins/templates/jenkins-controller-podmonitor.yaml
index 9a04019c3..898fab6be 100644
--- a/charts/jenkins/templates/jenkins-controller-podmonitor.yaml
+++ b/charts/jenkins/templates/jenkins-controller-podmonitor.yaml
@@ -10,12 +10,7 @@ metadata:
   namespace: {{ template "jenkins.namespace" . }}
 {{- end }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 
 spec:
diff --git a/charts/jenkins/templates/jenkins-controller-secondary-ingress.yaml b/charts/jenkins/templates/jenkins-controller-secondary-ingress.yaml
index c63e48229..ea18a01e8 100644
--- a/charts/jenkins/templates/jenkins-controller-secondary-ingress.yaml
+++ b/charts/jenkins/templates/jenkins-controller-secondary-ingress.yaml
@@ -13,12 +13,7 @@ kind: Ingress
 metadata:
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
     {{- if .Values.controller.secondaryingress.labels -}}
     {{ toYaml .Values.controller.secondaryingress.labels | nindent 4 }}
diff --git a/charts/jenkins/templates/jenkins-controller-servicemonitor.yaml b/charts/jenkins/templates/jenkins-controller-servicemonitor.yaml
index 8710b2bc9..6107b4a32 100644
--- a/charts/jenkins/templates/jenkins-controller-servicemonitor.yaml
+++ b/charts/jenkins/templates/jenkins-controller-servicemonitor.yaml
@@ -10,12 +10,7 @@ metadata:
   namespace: {{ template "jenkins.namespace" . }}
 {{- end }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
     {{- range $key, $val := .Values.controller.prometheus.serviceMonitorAdditionalLabels }}
     {{ $key }}: {{ $val | quote }}
diff --git a/charts/jenkins/templates/jenkins-controller-statefulset.yaml b/charts/jenkins/templates/jenkins-controller-statefulset.yaml
index 477e083f9..b23c850ef 100644
--- a/charts/jenkins/templates/jenkins-controller-statefulset.yaml
+++ b/charts/jenkins/templates/jenkins-controller-statefulset.yaml
@@ -8,12 +8,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
     {{- range $key, $val := .Values.controller.statefulSetLabels }}
     {{ $key }}: {{ $val | quote }}
@@ -36,9 +31,7 @@ spec:
   template:
     metadata:
       labels:
-        "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-        "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-        "app.kubernetes.io/instance": "{{ .Release.Name }}"
+        {{- include "jenkins.commonlabels" . | nindent 8 }}
         "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
         {{- range $key, $val := .Values.controller.podLabels }}
         {{ $key }}: {{ $val | quote }}
diff --git a/charts/jenkins/templates/jenkins-controller-svc.yaml b/charts/jenkins/templates/jenkins-controller-svc.yaml
index a83466ce3..bda8caf8f 100644
--- a/charts/jenkins/templates/jenkins-controller-svc.yaml
+++ b/charts/jenkins/templates/jenkins-controller-svc.yaml
@@ -4,12 +4,7 @@ metadata:
   name: {{template "jenkins.fullname" . }}
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
     {{- if .Values.controller.serviceLabels }}
 {{ toYaml .Values.controller.serviceLabels | indent 4 }}
diff --git a/charts/jenkins/templates/rbac.yaml b/charts/jenkins/templates/rbac.yaml
index 581cb8d48..e130dd77f 100644
--- a/charts/jenkins/templates/rbac.yaml
+++ b/charts/jenkins/templates/rbac.yaml
@@ -8,12 +8,7 @@ metadata:
   name: {{ $serviceName }}-schedule-agents
   namespace: {{ template "jenkins.agent.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 rules:
 - apiGroups: [""]
@@ -33,12 +28,7 @@ metadata:
   name: {{ $serviceName }}-schedule-agents
   namespace: {{ template "jenkins.agent.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -60,12 +50,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}-read-secrets
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 rules:
   - apiGroups: [""]
@@ -80,12 +65,7 @@ metadata:
   name: {{ $serviceName }}-read-secrets
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -108,12 +88,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}-casc-reload
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 rules:
 - apiGroups: [""]
@@ -128,12 +103,7 @@ metadata:
   name: {{ $serviceName }}-watch-configmaps
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/charts/jenkins/templates/secret-additional.yaml b/charts/jenkins/templates/secret-additional.yaml
index d1908aa9b..38b6485bd 100644
--- a/charts/jenkins/templates/secret-additional.yaml
+++ b/charts/jenkins/templates/secret-additional.yaml
@@ -6,12 +6,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}-additional-secrets
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 type: Opaque
 data:
diff --git a/charts/jenkins/templates/secret-claims.yaml b/charts/jenkins/templates/secret-claims.yaml
index e8b6d6c8e..d48d4931a 100644
--- a/charts/jenkins/templates/secret-claims.yaml
+++ b/charts/jenkins/templates/secret-claims.yaml
@@ -12,12 +12,7 @@ metadata:
   name: {{ $serviceName }}-{{ .name | default .path | lower }}
   namespace: {{ $namespace }}
   labels:
-    "app.kubernetes.io/name": '{{ $serviceName }}'
-    {{- if $v.renderHelmLabels }}
-    "helm.sh/chart": "{{ $chart }}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ $r.Service }}"
-    "app.kubernetes.io/instance": "{{ $r.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ $v.controller.componentName }}"
 spec:
   type: {{ .type | default "Opaque" }}
@@ -26,4 +21,4 @@ spec:
   renew: {{ .renew }}
 {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/jenkins/templates/secret-https-jks.yaml b/charts/jenkins/templates/secret-https-jks.yaml
index 5348de41e..dc09121df 100644
--- a/charts/jenkins/templates/secret-https-jks.yaml
+++ b/charts/jenkins/templates/secret-https-jks.yaml
@@ -5,12 +5,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}-https-jks
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 type: Opaque
 data:
diff --git a/charts/jenkins/templates/secret.yaml b/charts/jenkins/templates/secret.yaml
index 4feb52f42..bd8ef7cc1 100644
--- a/charts/jenkins/templates/secret.yaml
+++ b/charts/jenkins/templates/secret.yaml
@@ -6,12 +6,7 @@ metadata:
   name: {{ template "jenkins.fullname" . }}
   namespace: {{ template "jenkins.namespace" . }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 type: Opaque
 data:
diff --git a/charts/jenkins/templates/service-account-agent.yaml b/charts/jenkins/templates/service-account-agent.yaml
index 48f08ba6c..3ac1a66d4 100644
--- a/charts/jenkins/templates/service-account-agent.yaml
+++ b/charts/jenkins/templates/service-account-agent.yaml
@@ -9,12 +9,7 @@ metadata:
 {{ tpl (toYaml .Values.serviceAccountAgent.annotations) . | indent 4 }}
 {{- end }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 {{- if .Values.serviceAccountAgent.extraLabels }}
 {{ tpl (toYaml .Values.serviceAccountAgent.extraLabels) . | indent 4 }}
diff --git a/charts/jenkins/templates/service-account.yaml b/charts/jenkins/templates/service-account.yaml
index b44eb488c..41c8d437e 100644
--- a/charts/jenkins/templates/service-account.yaml
+++ b/charts/jenkins/templates/service-account.yaml
@@ -9,12 +9,7 @@ metadata:
 {{ tpl (toYaml .Values.serviceAccount.annotations) . | indent 4 }}
 {{- end }}
   labels:
-    "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
-    {{- if .Values.renderHelmLabels }}
-    "helm.sh/chart": "{{ template "jenkins.label" .}}"
-    {{- end }}
-    "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
-    "app.kubernetes.io/instance": "{{ .Release.Name }}"
+    {{- include "jenkins.commonlabels" . | nindent 4 }}
     "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
 {{- if .Values.serviceAccount.extraLabels }}
 {{ tpl (toYaml .Values.serviceAccount.extraLabels) . | indent 4 }}
diff --git a/charts/jenkins/unittests/__snapshot__/jenkins-controller-statefulset-test.yaml.snap b/charts/jenkins/unittests/__snapshot__/jenkins-controller-statefulset-test.yaml.snap
index 164fa6acd..495b1ff1b 100644
--- a/charts/jenkins/unittests/__snapshot__/jenkins-controller-statefulset-test.yaml.snap
+++ b/charts/jenkins/unittests/__snapshot__/jenkins-controller-statefulset-test.yaml.snap
@@ -1,5 +1,5 @@
 render pod annotations:
   1: |
-    checksum/config: e9c390a2ecfa538ee038b07834bd56ac20fee77706eb3a112fdaa2d177185ede
+    checksum/config: 53565fb86283bddd3593f55fbdfc781b78320ab662fbb6d0c0b99f66342188c2
     fixed-annotation: some-fixed-annotation
     templated-annotations: my-release
diff --git a/charts/jenkins/unittests/config-test.yaml b/charts/jenkins/unittests/config-test.yaml
index 57bd7020c..5e1f9a84b 100644
--- a/charts/jenkins/unittests/config-test.yaml
+++ b/charts/jenkins/unittests/config-test.yaml
@@ -15,6 +15,9 @@ tests:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
+            helm.sh/chart: jenkins-4.3.29
       - equal:
           path: data.apply_config\.sh
           value: |-
diff --git a/charts/jenkins/unittests/home-pvc-test.yaml b/charts/jenkins/unittests/home-pvc-test.yaml
index 1ad52e566..c18dc4f55 100644
--- a/charts/jenkins/unittests/home-pvc-test.yaml
+++ b/charts/jenkins/unittests/home-pvc-test.yaml
@@ -76,6 +76,8 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
 
   - it: add label
     set:
@@ -91,4 +93,6 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
             test-label: test-value
diff --git a/charts/jenkins/unittests/jcasc-config-test.yaml b/charts/jenkins/unittests/jcasc-config-test.yaml
index 3c74ec804..6bcfc39ed 100644
--- a/charts/jenkins/unittests/jcasc-config-test.yaml
+++ b/charts/jenkins/unittests/jcasc-config-test.yaml
@@ -1191,6 +1191,8 @@ tests:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
   - it: disable agents
     release:
       namespace: controller-namespace
diff --git a/charts/jenkins/unittests/jenkins-agent-svc-test.yaml b/charts/jenkins/unittests/jenkins-agent-svc-test.yaml
index ec1048a9d..38b96557c 100644
--- a/charts/jenkins/unittests/jenkins-agent-svc-test.yaml
+++ b/charts/jenkins/unittests/jenkins-agent-svc-test.yaml
@@ -121,10 +121,12 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
   - it: disable agent service
     set:
       controller:
         agentListenerEnabled: false
     asserts:
     - hasDocuments:
-        count: 0
\ No newline at end of file
+        count: 0
diff --git a/charts/jenkins/unittests/jenkins-controller-alerting-rules-test.yaml b/charts/jenkins/unittests/jenkins-controller-alerting-rules-test.yaml
index bdeece874..2492c2434 100644
--- a/charts/jenkins/unittests/jenkins-controller-alerting-rules-test.yaml
+++ b/charts/jenkins/unittests/jenkins-controller-alerting-rules-test.yaml
@@ -76,4 +76,6 @@ tests:
             app.kubernetes.io/component: jenkins-controller
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
-            app.kubernetes.io/name: jenkins
\ No newline at end of file
+            app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
diff --git a/charts/jenkins/unittests/jenkins-controller-ingress-1.19-test.yaml b/charts/jenkins/unittests/jenkins-controller-ingress-1.19-test.yaml
index 0183331be..68a9c9411 100644
--- a/charts/jenkins/unittests/jenkins-controller-ingress-1.19-test.yaml
+++ b/charts/jenkins/unittests/jenkins-controller-ingress-1.19-test.yaml
@@ -129,6 +129,8 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
   - it: empty paths
     set:
       controller.ingress:
diff --git a/charts/jenkins/unittests/jenkins-controller-ingress-test.yaml b/charts/jenkins/unittests/jenkins-controller-ingress-test.yaml
index 6508d7e65..6fd397fb0 100644
--- a/charts/jenkins/unittests/jenkins-controller-ingress-test.yaml
+++ b/charts/jenkins/unittests/jenkins-controller-ingress-test.yaml
@@ -114,6 +114,8 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
   - it: empty paths
     set:
       controller.ingress:
diff --git a/charts/jenkins/unittests/jenkins-controller-networkpolicy-test.yaml b/charts/jenkins/unittests/jenkins-controller-networkpolicy-test.yaml
index 09047ff1c..f69b10c8b 100644
--- a/charts/jenkins/unittests/jenkins-controller-networkpolicy-test.yaml
+++ b/charts/jenkins/unittests/jenkins-controller-networkpolicy-test.yaml
@@ -72,6 +72,8 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
   - it: disable agent listener
     set:
       networkPolicy.enabled: true
diff --git a/charts/jenkins/unittests/jenkins-controller-pdb-test.yaml b/charts/jenkins/unittests/jenkins-controller-pdb-test.yaml
index 7a43bfc9f..0a121ff7c 100644
--- a/charts/jenkins/unittests/jenkins-controller-pdb-test.yaml
+++ b/charts/jenkins/unittests/jenkins-controller-pdb-test.yaml
@@ -55,3 +55,5 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
diff --git a/charts/jenkins/unittests/jenkins-controller-secondary-ingress-1.19-test.yaml b/charts/jenkins/unittests/jenkins-controller-secondary-ingress-1.19-test.yaml
index 8df3a3493..20c93cbcc 100644
--- a/charts/jenkins/unittests/jenkins-controller-secondary-ingress-1.19-test.yaml
+++ b/charts/jenkins/unittests/jenkins-controller-secondary-ingress-1.19-test.yaml
@@ -76,3 +76,5 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
diff --git a/charts/jenkins/unittests/jenkins-controller-secondary-ingress-test.yaml b/charts/jenkins/unittests/jenkins-controller-secondary-ingress-test.yaml
index b5aed8c46..dff240611 100644
--- a/charts/jenkins/unittests/jenkins-controller-secondary-ingress-test.yaml
+++ b/charts/jenkins/unittests/jenkins-controller-secondary-ingress-test.yaml
@@ -74,3 +74,5 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
diff --git a/charts/jenkins/unittests/jenkins-controller-servicemonitor_test.yaml b/charts/jenkins/unittests/jenkins-controller-servicemonitor_test.yaml
index a847061e3..5e269dac0 100644
--- a/charts/jenkins/unittests/jenkins-controller-servicemonitor_test.yaml
+++ b/charts/jenkins/unittests/jenkins-controller-servicemonitor_test.yaml
@@ -80,6 +80,8 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
   - it: set relabling
     set:
       controller:
diff --git a/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml b/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml
index c68f2290d..d95193093 100644
--- a/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml
+++ b/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml
@@ -46,12 +46,15 @@ tests:
             template:
               metadata:
                 annotations:
-                  checksum/config: e9c390a2ecfa538ee038b07834bd56ac20fee77706eb3a112fdaa2d177185ede
+                  checksum/config: 53565fb86283bddd3593f55fbdfc781b78320ab662fbb6d0c0b99f66342188c2
                 labels:
                   app.kubernetes.io/component: jenkins-controller
                   app.kubernetes.io/instance: my-release
                   app.kubernetes.io/managed-by: Helm
                   app.kubernetes.io/name: jenkins
+                  app.kubernetes.io/part-of: jenkins
+                  app.kubernetes.io/version: 2.401.1-jdk11
+                  helm.sh/chart: jenkins-4.3.29
               spec:
                 containers:
                   - args:
@@ -391,6 +394,8 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
   - it: java & jenkins opts with quotes
     template: jenkins-controller-statefulset.yaml
     set:
diff --git a/charts/jenkins/unittests/jenkins-controller-svc-test.yaml b/charts/jenkins/unittests/jenkins-controller-svc-test.yaml
index f1349ee5d..d1f8c3724 100644
--- a/charts/jenkins/unittests/jenkins-controller-svc-test.yaml
+++ b/charts/jenkins/unittests/jenkins-controller-svc-test.yaml
@@ -156,3 +156,5 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
diff --git a/charts/jenkins/unittests/rbac-test.yaml b/charts/jenkins/unittests/rbac-test.yaml
index 592373ea9..e85f04c05 100644
--- a/charts/jenkins/unittests/rbac-test.yaml
+++ b/charts/jenkins/unittests/rbac-test.yaml
@@ -162,6 +162,8 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
 
   - it: Role read-secrets
     set:
@@ -214,4 +216,3 @@ tests:
             - kind: ServiceAccount
               name: my-release-jenkins
               namespace: my-namespace
-
diff --git a/charts/jenkins/unittests/secret-test.yaml b/charts/jenkins/unittests/secret-test.yaml
index 12ea5c17e..59ef10947 100644
--- a/charts/jenkins/unittests/secret-test.yaml
+++ b/charts/jenkins/unittests/secret-test.yaml
@@ -49,6 +49,8 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
   - it: disable
     set:
       controller:
@@ -62,4 +64,3 @@ tests:
     asserts:
     - hasDocuments:
         count: 0
-
diff --git a/charts/jenkins/unittests/service-account-agent-test.yaml b/charts/jenkins/unittests/service-account-agent-test.yaml
index 26d26e087..6d8aca5e0 100644
--- a/charts/jenkins/unittests/service-account-agent-test.yaml
+++ b/charts/jenkins/unittests/service-account-agent-test.yaml
@@ -70,6 +70,8 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
   - it: agent image pull secret
     set:
       renderHelmLabels: false
@@ -81,7 +83,7 @@ tests:
           path: imagePullSecrets
           value:
               - name: ips-name
-  - it: agent service account attach labels 
+  - it: agent service account attach labels
     set:
       serviceAccountAgent:
         create: true
diff --git a/charts/jenkins/unittests/service-account-test.yaml b/charts/jenkins/unittests/service-account-test.yaml
index 4aa20fe75..45cd90065 100644
--- a/charts/jenkins/unittests/service-account-test.yaml
+++ b/charts/jenkins/unittests/service-account-test.yaml
@@ -35,6 +35,8 @@ tests:
             app.kubernetes.io/instance: my-release
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: jenkins
+            app.kubernetes.io/part-of: jenkins
+            app.kubernetes.io/version: 2.401.1-jdk11
 
   - it: disabled
     set: