diff --git a/charts/kvisor/templates/_helpers.tpl b/charts/kvisor/templates/_helpers.tpl
index 73b0cbd8..c3307e14 100644
--- a/charts/kvisor/templates/_helpers.tpl
+++ b/charts/kvisor/templates/_helpers.tpl
@@ -43,18 +43,21 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 
-{{- define "kvisor.labels" -}}
+{{- define "kvisor.topLevelLabels" -}}
 helm.sh/chart: {{ include "kvisor.chart" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+
+{{- define "kvisor.commonLabels" -}}
 {{- range $key, $value := .Values.commonLabels }}
 {{$key}}: {{$value}}
 {{- end }}
 {{- end }}
 
-
 {{/*
 Common helpers for runtime agent.
 */}}
@@ -71,7 +74,7 @@ Common helpers for runtime agent.
 {{- end }}
 
 {{- define "kvisor.agent.labels" -}}
-{{ include "kvisor.labels" . }}
+{{ include "kvisor.topLevelLabels" . }}
 {{ include "kvisor.agent.selectorLabels" . }}
 {{- end }}
 
@@ -79,6 +82,7 @@ Common helpers for runtime agent.
 app.kubernetes.io/name: {{ include "kvisor.agent.fullname" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/component: agent
+{{ include "kvisor.commonLabels" . }}
 {{- end }}
 
 {{/*
@@ -97,7 +101,7 @@ Common helpers for controller.
 {{- end }}
 
 {{- define "kvisor.controller.labels" -}}
-{{ include "kvisor.labels" . }}
+{{ include "kvisor.topLevelLabels" . }}
 {{ include "kvisor.controller.selectorLabels" . }}
 {{- end }}
 
@@ -105,6 +109,7 @@ Common helpers for controller.
 app.kubernetes.io/name: {{ include "kvisor.controller.fullname" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/component: controller
+{{ include "kvisor.commonLabels" . }}
 {{- end }}
 
 
@@ -118,10 +123,11 @@ Common helpers for event generator.
 {{- define "kvisor.eventGenerator.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "kvisor.name" . }}-event-generator
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{ include "kvisor.commonLabels" . }}
 {{- end }}
 
 {{- define "kvisor.eventGenerator.labels" -}}
-{{ include "kvisor.labels" . }}
+{{ include "kvisor.topLevelLabels" . }}
 {{ include "kvisor.eventGenerator.selectorLabels" . }}
 {{- end }}
 
@@ -147,5 +153,5 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{- define "kvisor.castaiMockServer.labels" -}}
-{{ include "kvisor.labels" . }}
+{{ include "kvisor.topLevelLabels" . }}
 {{- end }}
diff --git a/charts/kvisor/templates/agent.yaml b/charts/kvisor/templates/agent.yaml
index b21e75a2..282fc44e 100644
--- a/charts/kvisor/templates/agent.yaml
+++ b/charts/kvisor/templates/agent.yaml
@@ -163,7 +163,8 @@ metadata:
   name: {{ include "kvisor.agent.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "kvisor.labels" . | nindent 4 }}
+    {{- include "kvisor.topLevelLabels" . | nindent 4}}
+    {{- include "kvisor.commonLabels" . | nindent 4 }}
   {{- with .Values.agent.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -174,7 +175,8 @@ kind: ClusterRole
 metadata:
   name: {{ include "kvisor.fullname" . }}
   labels:
-    {{- include "kvisor.labels" . | nindent 4 }}
+    {{- include "kvisor.topLevelLabels" . | nindent 4}}
+    {{- include "kvisor.commonLabels" . | nindent 4 }}
 rules:
   - apiGroups:
       - ""
@@ -210,7 +212,8 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ include "kvisor.fullname" . }}
   labels:
-    {{- include "kvisor.labels" . | nindent 4 }}
+    {{- include "kvisor.topLevelLabels" . | nindent 4}}
+    {{- include "kvisor.commonLabels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/charts/kvisor/templates/secret.yaml b/charts/kvisor/templates/secret.yaml
index 8c6e0630..746eb322 100644
--- a/charts/kvisor/templates/secret.yaml
+++ b/charts/kvisor/templates/secret.yaml
@@ -4,7 +4,8 @@ metadata:
   name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "kvisor.labels" . | nindent 4 }}
+    {{- include "kvisor.topLevelLabels" . | nindent 4}}
+    {{- include "kvisor.commonLabels" . | nindent 4 }}
 data:
   {{- if .Values.castai.apiKey }}
   CASTAI_API_KEY: {{ required "castai.apiKey must be provided" .Values.castai.apiKey | b64enc | quote }}