diff --git a/clients/harbor-client/charts/templates/_helpers.tpl b/clients/harbor-client/charts/templates/_helpers.tpl
index 7726eef..a2d66e2 100644
--- a/clients/harbor-client/charts/templates/_helpers.tpl
+++ b/clients/harbor-client/charts/templates/_helpers.tpl
@@ -30,6 +30,18 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Common labels
+*/}}
+{{- define "snappcloud-harbor-client.labels" -}}
+helm.sh/chart: {{ include "snappcloud-harbor-client.chart" . }}
+{{ include "snappcloud-harbor-client.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
 Selector labels
 */}}
 {{- define "snappcloud-harbor-client.selectorLabels" -}}
diff --git a/clients/harbor-client/charts/templates/deployment.yaml b/clients/harbor-client/charts/templates/deployment.yaml
index a61fced..1609bea 100644
--- a/clients/harbor-client/charts/templates/deployment.yaml
+++ b/clients/harbor-client/charts/templates/deployment.yaml
@@ -2,6 +2,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "snappcloud-harbor-client.fullname" . }}
+  labels:
+    {{- include "snappcloud-harbor-client.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -13,6 +15,11 @@ spec:
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      labels:
+        {{- include "snappcloud-harbor-client.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/clients/proxy-client/charts/templates/_helpers.tpl b/clients/proxy-client/charts/templates/_helpers.tpl
index a10a652..acba731 100644
--- a/clients/proxy-client/charts/templates/_helpers.tpl
+++ b/clients/proxy-client/charts/templates/_helpers.tpl
@@ -30,6 +30,18 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Common labels
+*/}}
+{{- define "snappcloud-proxy-client.labels" -}}
+helm.sh/chart: {{ include "snappcloud-proxy-client.chart" . }}
+{{ include "snappcloud-proxy-client.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
 Selector labels
 */}}
 {{- define "snappcloud-proxy-client.selectorLabels" -}}
diff --git a/clients/proxy-client/charts/templates/deployment.yaml b/clients/proxy-client/charts/templates/deployment.yaml
index adc7be3..b4d0b6c 100644
--- a/clients/proxy-client/charts/templates/deployment.yaml
+++ b/clients/proxy-client/charts/templates/deployment.yaml
@@ -2,6 +2,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "snappcloud-proxy-client.fullname" . }}
+  labels:
+    {{- include "snappcloud-proxy-client.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -13,6 +15,11 @@ spec:
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      labels:
+        {{- include "snappcloud-proxy-client.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets: