diff --git a/charts/rancher-vsphere-cpi/templates/_helpers.tpl b/charts/rancher-vsphere-cpi/templates/_helpers.tpl
index a608baf..84a8eb0 100644
--- a/charts/rancher-vsphere-cpi/templates/_helpers.tpl
+++ b/charts/rancher-vsphere-cpi/templates/_helpers.tpl
@@ -29,4 +29,21 @@ add below linux tolerations to workloads could be scheduled to those linux nodes
 
 {{- define "linux-node-selector" -}}
 kubernetes.io/os: linux
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "chartName" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Labels that should be added on each resource
+*/}}
+{{- define "labels" -}}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+helm.sh/chart: {{ include "chartName" . }}
+{{- end -}}
+
diff --git a/charts/rancher-vsphere-cpi/templates/configmap.yaml b/charts/rancher-vsphere-cpi/templates/configmap.yaml
index 9d95af5..263bb15 100644
--- a/charts/rancher-vsphere-cpi/templates/configmap.yaml
+++ b/charts/rancher-vsphere-cpi/templates/configmap.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     vsphere-cpi-infra: config
     component: {{ .Chart.Name }}-cloud-controller-manager
+  {{- include "labels" . | nindent 4 }}
   namespace: {{ .Release.Namespace }}
 data:
   vsphere.yaml: |
diff --git a/charts/rancher-vsphere-cpi/templates/daemonset.yaml b/charts/rancher-vsphere-cpi/templates/daemonset.yaml
index 0d0d7a4..000a9f6 100644
--- a/charts/rancher-vsphere-cpi/templates/daemonset.yaml
+++ b/charts/rancher-vsphere-cpi/templates/daemonset.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     component: {{ .Chart.Name }}-cloud-controller-manager
     tier: control-plane
+  {{- include "labels" . | nindent 4 }}
   namespace: {{ .Release.Namespace }}
   annotations:
     scheduler.alpha.kubernetes.io/critical-pod: ""
@@ -21,6 +22,10 @@ spec:
         name: {{ .Chart.Name }}-cloud-controller-manager
         component: {{ .Chart.Name }}-cloud-controller-manager
         tier: control-plane
+      {{- include "labels" . | nindent 8 }}
+      {{- with .Values.cloudControllerManager.podLabels }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       {{- if .Values.cloudControllerManager.nodeSelector }}
       nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
diff --git a/charts/rancher-vsphere-cpi/templates/role-binding.yaml b/charts/rancher-vsphere-cpi/templates/role-binding.yaml
index 096c2d6..1782186 100644
--- a/charts/rancher-vsphere-cpi/templates/role-binding.yaml
+++ b/charts/rancher-vsphere-cpi/templates/role-binding.yaml
@@ -10,6 +10,7 @@ items:
     labels:
       vsphere-cpi-infra: role-binding
       component: {{ .Chart.Name }}-cloud-controller-manager
+    {{- include "labels" . | nindent 6 }}
     namespace: {{ .Release.Namespace }}
   roleRef:
     apiGroup: rbac.authorization.k8s.io
@@ -30,6 +31,7 @@ items:
     labels:
       vsphere-cpi-infra: cluster-role-binding
       component: {{ .Chart.Name }}-cloud-controller-manager
+    {{- include "labels" . | nindent 6 }}
   roleRef:
     apiGroup: rbac.authorization.k8s.io
     kind: ClusterRole
diff --git a/charts/rancher-vsphere-cpi/templates/role.yaml b/charts/rancher-vsphere-cpi/templates/role.yaml
index f26b834..f33e66a 100644
--- a/charts/rancher-vsphere-cpi/templates/role.yaml
+++ b/charts/rancher-vsphere-cpi/templates/role.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     vsphere-cpi-infra: role
     component: {{ .Chart.Name }}-cloud-controller-manager
+  {{- include "labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - ""
diff --git a/charts/rancher-vsphere-cpi/templates/secret.yaml b/charts/rancher-vsphere-cpi/templates/secret.yaml
index 1fc8ef8..c426e40 100644
--- a/charts/rancher-vsphere-cpi/templates/secret.yaml
+++ b/charts/rancher-vsphere-cpi/templates/secret.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     vsphere-cpi-infra: secret
     component: {{ .Chart.Name }}-cloud-controller-manager
+    {{- include "labels" . | nindent 4 }}
   namespace: {{ .Release.Namespace }}
 data:
   {{ .Values.vCenter.host }}.username: {{ .Values.vCenter.username | b64enc | quote }}
diff --git a/charts/rancher-vsphere-cpi/templates/service-account.yaml b/charts/rancher-vsphere-cpi/templates/service-account.yaml
index 8e26955..c9508fe 100644
--- a/charts/rancher-vsphere-cpi/templates/service-account.yaml
+++ b/charts/rancher-vsphere-cpi/templates/service-account.yaml
@@ -6,5 +6,6 @@ metadata:
   labels:
     vsphere-cpi-infra: service-account
     component: {{ .Chart.Name }}-cloud-controller-manager
+  {{- include "labels" . | nindent 4 }}
   namespace: {{ .Release.Namespace }}
 {{- end -}}
diff --git a/charts/rancher-vsphere-cpi/templates/service.yaml b/charts/rancher-vsphere-cpi/templates/service.yaml
index e50d0b5..ed6ad07 100644
--- a/charts/rancher-vsphere-cpi/templates/service.yaml
+++ b/charts/rancher-vsphere-cpi/templates/service.yaml
@@ -3,6 +3,7 @@ kind: Service
 metadata:
   labels:
     component: {{ .Chart.Name }}-cloud-controller-manager
+  {{- include "labels" . | nindent 4 }}
   name: {{ .Chart.Name }}-cloud-controller-manager
   namespace: {{ .Release.Namespace }}
 spec:
diff --git a/charts/rancher-vsphere-cpi/values.yaml b/charts/rancher-vsphere-cpi/values.yaml
index 7e04df6..830b52c 100644
--- a/charts/rancher-vsphere-cpi/values.yaml
+++ b/charts/rancher-vsphere-cpi/values.yaml
@@ -73,6 +73,8 @@ cloudControllerManager:
   tag: v1.22.7
   nodeSelector: {}
   tolerations: []
+  ## Optional additional labels to add to pods
+  podLabels: {}
   rbac:
     enabled: true
 
diff --git a/charts/rancher-vsphere-csi/templates/_helpers.tpl b/charts/rancher-vsphere-csi/templates/_helpers.tpl
index a608baf..84a8eb0 100644
--- a/charts/rancher-vsphere-csi/templates/_helpers.tpl
+++ b/charts/rancher-vsphere-csi/templates/_helpers.tpl
@@ -29,4 +29,21 @@ add below linux tolerations to workloads could be scheduled to those linux nodes
 
 {{- define "linux-node-selector" -}}
 kubernetes.io/os: linux
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "chartName" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Labels that should be added on each resource
+*/}}
+{{- define "labels" -}}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+helm.sh/chart: {{ include "chartName" . }}
+{{- end -}}
+
diff --git a/charts/rancher-vsphere-csi/templates/controller/deployment.yaml b/charts/rancher-vsphere-csi/templates/controller/deployment.yaml
index 3a5bb8d..829ad84 100644
--- a/charts/rancher-vsphere-csi/templates/controller/deployment.yaml
+++ b/charts/rancher-vsphere-csi/templates/controller/deployment.yaml
@@ -4,6 +4,8 @@ apiVersion: apps/v1
 metadata:
   name: vsphere-csi-controller
   namespace: {{ .Release.Namespace }}
+  labels:
+  {{- include "labels" . | nindent 4 }}
 spec:
   replicas: 3
   strategy:
@@ -19,6 +21,10 @@ spec:
       labels:
         app: vsphere-csi-controller
         role: vsphere-csi
+      {{- include "labels" . | nindent 8 }}
+      {{- with .Values.csiController.podLabels }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: vsphere-csi-controller
       {{- if .Values.csiController.nodeSelector }}
diff --git a/charts/rancher-vsphere-csi/templates/controller/role-binding.yaml b/charts/rancher-vsphere-csi/templates/controller/role-binding.yaml
index 0a30fd7..3902e70 100644
--- a/charts/rancher-vsphere-csi/templates/controller/role-binding.yaml
+++ b/charts/rancher-vsphere-csi/templates/controller/role-binding.yaml
@@ -2,6 +2,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: vsphere-csi-controller-binding
+  labels:
+  {{- include "labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: vsphere-csi-controller
diff --git a/charts/rancher-vsphere-csi/templates/controller/role.yaml b/charts/rancher-vsphere-csi/templates/controller/role.yaml
index 0d869f7..1aafdaa 100644
--- a/charts/rancher-vsphere-csi/templates/controller/role.yaml
+++ b/charts/rancher-vsphere-csi/templates/controller/role.yaml
@@ -2,6 +2,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: vsphere-csi-controller-role
+  labels:
+  {{- include "labels" . | nindent 4 }}
 rules:
   - apiGroups: [""]
     resources: ["nodes", "pods", "configmaps"]
diff --git a/charts/rancher-vsphere-csi/templates/controller/service-account.yaml b/charts/rancher-vsphere-csi/templates/controller/service-account.yaml
index b6dbe5d..30f0cc1 100644
--- a/charts/rancher-vsphere-csi/templates/controller/service-account.yaml
+++ b/charts/rancher-vsphere-csi/templates/controller/service-account.yaml
@@ -3,3 +3,5 @@ apiVersion: v1
 metadata:
   name: vsphere-csi-controller
   namespace: {{ .Release.Namespace }}
+  labels:
+  {{- include "labels" . | nindent 4 }}
diff --git a/charts/rancher-vsphere-csi/templates/controller/service.yaml b/charts/rancher-vsphere-csi/templates/controller/service.yaml
index c3aa0e4..1bc8e60 100644
--- a/charts/rancher-vsphere-csi/templates/controller/service.yaml
+++ b/charts/rancher-vsphere-csi/templates/controller/service.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: vsphere-csi-controller
+  {{- include "labels" . | nindent 4 }}
 spec:
   ports:
     - name: ctlr
diff --git a/charts/rancher-vsphere-csi/templates/node/daemonset.yaml b/charts/rancher-vsphere-csi/templates/node/daemonset.yaml
index 2d14bde..c1d1efc 100644
--- a/charts/rancher-vsphere-csi/templates/node/daemonset.yaml
+++ b/charts/rancher-vsphere-csi/templates/node/daemonset.yaml
@@ -4,6 +4,8 @@ apiVersion: apps/v1
 metadata:
   name: vsphere-csi-node
   namespace: {{ .Release.Namespace }}
+  labels:
+  {{- include "labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
@@ -17,6 +19,10 @@ spec:
       labels:
         app: vsphere-csi-node
         role: vsphere-csi
+      {{- include "labels" . | nindent 8 }}
+      {{- with .Values.csiNode.podLabels }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       {{- if .Values.csiNode.nodeSelector }}
       nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
diff --git a/charts/rancher-vsphere-csi/templates/node/role-binding.yaml b/charts/rancher-vsphere-csi/templates/node/role-binding.yaml
index c968ef0..b51d255 100644
--- a/charts/rancher-vsphere-csi/templates/node/role-binding.yaml
+++ b/charts/rancher-vsphere-csi/templates/node/role-binding.yaml
@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: vsphere-csi-node-binding
   namespace: {{ .Release.Namespace }}
+  labels:
+  {{- include "labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: vsphere-csi-node
@@ -18,6 +20,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: vsphere-csi-node-cluster-role-binding
+  labels:
+  {{- include "labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: vsphere-csi-node
diff --git a/charts/rancher-vsphere-csi/templates/node/role.yaml b/charts/rancher-vsphere-csi/templates/node/role.yaml
index 74546d0..b456f82 100644
--- a/charts/rancher-vsphere-csi/templates/node/role.yaml
+++ b/charts/rancher-vsphere-csi/templates/node/role.yaml
@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: vsphere-csi-node-role
   namespace: {{ .Release.Namespace }}
+  labels:
+  {{- include "labels" . | nindent 4 }}
 rules:
   - apiGroups: [""]
     resources: ["configmaps"]
@@ -12,6 +14,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: vsphere-csi-node-cluster-role
+  labels:
+  {{- include "labels" . | nindent 4 }}
 rules:
   - apiGroups: ["cns.vmware.com"]
     resources: ["csinodetopologies"]
diff --git a/charts/rancher-vsphere-csi/templates/node/service-account.yaml b/charts/rancher-vsphere-csi/templates/node/service-account.yaml
index d2d4528..7eb70cd 100644
--- a/charts/rancher-vsphere-csi/templates/node/service-account.yaml
+++ b/charts/rancher-vsphere-csi/templates/node/service-account.yaml
@@ -3,3 +3,5 @@ apiVersion: v1
 metadata:
   name: vsphere-csi-node
   namespace: {{ .Release.Namespace }}
+  labels:
+  {{- include "labels" . | nindent 4 }}
diff --git a/charts/rancher-vsphere-csi/values.yaml b/charts/rancher-vsphere-csi/values.yaml
index 9395143..62a0d5e 100644
--- a/charts/rancher-vsphere-csi/values.yaml
+++ b/charts/rancher-vsphere-csi/values.yaml
@@ -56,6 +56,9 @@ csiController:
   #   operator: Exists
   #   effect: NoExecute
   #   tolerationSeconds: 30
+  ##
+  ## Optional additional labels to add to pods
+  podLabels: {}
 
 # Internal features
 csiMigration:
@@ -96,6 +99,8 @@ csiNode:
   nodeSelector: {}
   ## List of node taints to tolerate (requires Kubernetes >= 1.6)
   tolerations: []
+  ## Optional additional labels to add to pods
+  podLabels: {} 
   prefixPath: ""
   image:
     repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
@@ -218,7 +223,7 @@ versionOverrides:
       csiController:
         image:
           repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
-          tag: v2.4.3
+          tag: v2.4.2
           csiAttacher:
             repository: rancher/mirrored-sig-storage-csi-attacher
             tag: v3.3.0
@@ -230,14 +235,14 @@ versionOverrides:
             tag: v2.4.0
           vsphereSyncer:
             repository: rancher/mirrored-cloud-provider-vsphere-csi-release-syncer
-            tag: v2.4.3
+            tag: v2.4.2
           csiProvisioner:
             repository: rancher/mirrored-sig-storage-csi-provisioner
             tag: v3.0.0
       csiNode:
         image:
           repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
-          tag: v2.4.3
+          tag: v2.4.2
           nodeDriverRegistrar:
             repository: rancher/mirrored-sig-storage-csi-node-driver-registrar
             tag: v2.3.0