diff --git a/charts/cinder-csi-plugin/templates/_helpers.tpl b/charts/cinder-csi-plugin/templates/_helpers.tpl
index 6a08471d36..497e80b11e 100644
--- a/charts/cinder-csi-plugin/templates/_helpers.tpl
+++ b/charts/cinder-csi-plugin/templates/_helpers.tpl
@@ -35,9 +35,7 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "cinder-csi.labels" -}}
-app.kubernetes.io/name: {{ include "cinder-csi.name" . }}
 helm.sh/chart: {{ include "cinder-csi.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -60,13 +58,13 @@ Create the name of the service account to use
 Create unified labels for cinder-csi components
 */}}
 {{- define "cinder-csi.common.matchLabels" -}}
-app: {{ template "cinder-csi.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "cinder-csi.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{- define "cinder-csi.common.metaLabels" -}}
-chart: {{ template "cinder-csi.chart" . }}
-heritage: {{ .Release.Service }}
+helm.sh/chart: {{ template "cinder-csi.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- if .Values.extraLabels }}
 {{ toYaml .Values.extraLabels -}}
 {{- end }}
@@ -79,7 +77,7 @@ component: controllerplugin
 
 {{- define "cinder-csi.controllerplugin.labels" -}}
 {{ include "cinder-csi.controllerplugin.matchLabels" . }}
-{{ include "cinder-csi.common.metaLabels" . }}
+{{ include "cinder-csi.labels" . }}
 {{- end -}}
 
 {{- define "cinder-csi.controllerplugin.podLabels" -}}
@@ -96,7 +94,7 @@ component: nodeplugin
 
 {{- define "cinder-csi.nodeplugin.labels" -}}
 {{ include "cinder-csi.nodeplugin.matchLabels" . }}
-{{ include "cinder-csi.common.metaLabels" . }}
+{{ include "cinder-csi.labels" . }}
 {{- end -}}
 
 {{- define "cinder-csi.nodeplugin.podLabels" -}}
diff --git a/charts/cinder-csi-plugin/templates/cinder-csi-driver.yaml b/charts/cinder-csi-plugin/templates/cinder-csi-driver.yaml
index 5b681e4c4d..18b63390a4 100644
--- a/charts/cinder-csi-plugin/templates/cinder-csi-driver.yaml
+++ b/charts/cinder-csi-plugin/templates/cinder-csi-driver.yaml
@@ -2,6 +2,8 @@ apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
   name: cinder.csi.openstack.org
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 spec:
   attachRequired: true
   podInfoOnMount: true
diff --git a/charts/cinder-csi-plugin/templates/controllerplugin-podmonitor.yaml b/charts/cinder-csi-plugin/templates/controllerplugin-podmonitor.yaml
index 2dd8ee6e4a..8f921ee2f3 100644
--- a/charts/cinder-csi-plugin/templates/controllerplugin-podmonitor.yaml
+++ b/charts/cinder-csi-plugin/templates/controllerplugin-podmonitor.yaml
@@ -4,6 +4,7 @@ kind: PodMonitor
 metadata:
   labels:
     {{- include "cinder-csi.controllerplugin.labels" . | nindent 4 }}
+    {{- include "cinder-csi.labels" . | nindent 4 }}
   {{- if .Values.csi.plugin.podMonitor.additionalLabels }}
     {{- toYaml .Values.csi.plugin.podMonitor.additionalLabels | nindent 4 }}
   {{- end }}
diff --git a/charts/cinder-csi-plugin/templates/controllerplugin-rbac.yaml b/charts/cinder-csi-plugin/templates/controllerplugin-rbac.yaml
index 7aa55d4aad..1891153014 100644
--- a/charts/cinder-csi-plugin/templates/controllerplugin-rbac.yaml
+++ b/charts/cinder-csi-plugin/templates/controllerplugin-rbac.yaml
@@ -6,11 +6,15 @@ kind: ServiceAccount
 metadata:
   name: csi-cinder-controller-sa
   namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "cinder-csi.controllerplugin.labels" . | nindent 4 }}
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-attacher-role
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -32,6 +36,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-attacher-binding
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: csi-cinder-controller-sa
@@ -46,6 +52,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-provisioner-role
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -79,6 +87,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-provisioner-binding
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: csi-cinder-controller-sa
@@ -93,6 +103,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-snapshotter-role
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -121,6 +133,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-snapshotter-binding
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: csi-cinder-controller-sa
@@ -134,6 +148,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-resizer-role
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 rules:
   # The following rule should be uncommented for plugins that require secrets
   # for provisioning.
@@ -163,6 +179,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-resizer-binding
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: csi-cinder-controller-sa
diff --git a/charts/cinder-csi-plugin/templates/nodeplugin-rbac.yaml b/charts/cinder-csi-plugin/templates/nodeplugin-rbac.yaml
index 894a8df219..4f5b105e37 100644
--- a/charts/cinder-csi-plugin/templates/nodeplugin-rbac.yaml
+++ b/charts/cinder-csi-plugin/templates/nodeplugin-rbac.yaml
@@ -3,11 +3,15 @@ kind: ServiceAccount
 metadata:
   name: csi-cinder-node-sa
   namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-nodeplugin-role
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -18,6 +22,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-nodeplugin-binding
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: csi-cinder-node-sa
diff --git a/charts/cinder-csi-plugin/templates/secret.yaml b/charts/cinder-csi-plugin/templates/secret.yaml
index 597880c0d5..3debc4d92d 100644
--- a/charts/cinder-csi-plugin/templates/secret.yaml
+++ b/charts/cinder-csi-plugin/templates/secret.yaml
@@ -4,6 +4,8 @@ kind: Secret
 metadata:
   name: {{ .Values.secret.name }}
   namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 type: Opaque
 stringData:
   {{ .Values.secret.data | toYaml | trimSuffix "\n" | nindent 2 }}
diff --git a/charts/cinder-csi-plugin/templates/storageclass.yaml b/charts/cinder-csi-plugin/templates/storageclass.yaml
index 704c30038b..0979b41b45 100644
--- a/charts/cinder-csi-plugin/templates/storageclass.yaml
+++ b/charts/cinder-csi-plugin/templates/storageclass.yaml
@@ -7,6 +7,8 @@ metadata:
   annotations:
     storageclass.kubernetes.io/is-default-class: "true"
   {{- end }}
+  labels:
+    {{- include "cinder-csi.labels" . | nindent 4 }}
 provisioner: cinder.csi.openstack.org
 reclaimPolicy: Delete
 allowVolumeExpansion: {{ .Values.storageClass.delete.allowVolumeExpansion }}