diff --git a/Makefile b/Makefile
index 3a7163af39..e60b13f4bc 100644
--- a/Makefile
+++ b/Makefile
@@ -398,7 +398,7 @@ codegen-helm-crds: $(KUSTOMIZE) codegen-crds-all ## Generate helm CRDs
 	@VERSION='"{{.Chart.AppVersion}}"' TOP_PATH=".." envsubst < config/templates/labels.yaml.envsubst > config/.helm/labels.yaml
 	@VERSION=dummy TOP_PATH=".." envsubst < config/templates/kustomization.yaml.envsubst > config/.helm/kustomization.yaml
 	@echo Generate helm crds... >&2
-	@$(KUSTOMIZE) build ./config/.helm | $(KUSTOMIZE) cfg grep kind=CustomResourceDefinition | $(SED) -e "1i{{- if .Values.installCRDs }}" -e '$$a{{- end }}' -e '/^  creationTimestamp: null/i \ \ \ \ {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}' > ./charts/kyverno/templates/crds.yaml
+	@$(KUSTOMIZE) build ./config/.helm | $(KUSTOMIZE) cfg grep kind=CustomResourceDefinition | $(SED) -e "1i{{- if .Values.installCRDs }}" -e '$$a{{- end }}' -e '/^  creationTimestamp: null/i \ \ \ \ {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}' > ./charts/kyverno/templates/crds.yaml
 
 .PHONY: codegen-helm-all
 codegen-helm-all: codegen-helm-crds codegen-helm-docs ## Generate helm docs and CRDs
diff --git a/charts/kyverno/templates/_helpers.tpl b/charts/kyverno/templates/_helpers.tpl
index 5d577b3e7c..09e9e43d7b 100644
--- a/charts/kyverno/templates/_helpers.tpl
+++ b/charts/kyverno/templates/_helpers.tpl
@@ -30,13 +30,12 @@ If release name contains chart name it will be used as a full name.
 
 {{/* Helm required labels */}}
 {{- define "kyverno.labels" -}}
+helm.sh/chart: {{ template "kyverno.chart" . }}
+{{ include "kyverno.matchLabels" . }}
 app.kubernetes.io/component: kyverno
-app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-app.kubernetes.io/name: {{ template "kyverno.name" . }}
 app.kubernetes.io/part-of: {{ template "kyverno.name" . }}
 app.kubernetes.io/version: "{{ .Chart.Version }}"
-helm.sh/chart: {{ template "kyverno.chart" . }}
 {{- if .Values.customLabels }}
 {{ toYaml .Values.customLabels }}
 {{- end }}
@@ -159,9 +158,3 @@ maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
 {{- end }}
 {{- $newWebhook | toJson }}
 {{- end }}
-
-{{- define "kyverno.crdAnnotations" -}}
-{{- range $key, $value := .Values.crds.annotations }}
-{{ $key }}: {{ $value | quote }}
-{{- end }}
-{{- end }}
diff --git a/charts/kyverno/templates/crds.yaml b/charts/kyverno/templates/crds.yaml
index 2fe9ade849..ddcd1834ea 100644
--- a/charts/kyverno/templates/crds.yaml
+++ b/charts/kyverno/templates/crds.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
     config.kubernetes.io/index: '1'
     internal.config.kubernetes.io/index: '1'
-    {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}
+    {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kyverno
@@ -268,7 +268,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
     config.kubernetes.io/index: '2'
     internal.config.kubernetes.io/index: '2'
-    {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}
+    {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kyverno
@@ -500,7 +500,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
     config.kubernetes.io/index: '3'
     internal.config.kubernetes.io/index: '3'
-    {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}
+    {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kyverno
@@ -1447,7 +1447,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
     config.kubernetes.io/index: '4'
     internal.config.kubernetes.io/index: '4'
-    {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}
+    {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kyverno
@@ -1709,7 +1709,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
     config.kubernetes.io/index: '5'
     internal.config.kubernetes.io/index: '5'
-    {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}
+    {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kyverno
@@ -1941,7 +1941,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
     config.kubernetes.io/index: '6'
     internal.config.kubernetes.io/index: '6'
-    {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}
+    {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kyverno
@@ -2888,7 +2888,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
     config.kubernetes.io/index: '7'
     internal.config.kubernetes.io/index: '7'
-    {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}
+    {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kyverno
@@ -10110,7 +10110,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
     config.kubernetes.io/index: '8'
     internal.config.kubernetes.io/index: '8'
-    {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}
+    {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kyverno
@@ -10383,7 +10383,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
     config.kubernetes.io/index: '9'
     internal.config.kubernetes.io/index: '9'
-    {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}
+    {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kyverno
@@ -10559,7 +10559,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
     config.kubernetes.io/index: '10'
     internal.config.kubernetes.io/index: '10'
-    {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}
+    {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kyverno
@@ -17781,7 +17781,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
     config.kubernetes.io/index: '11'
     internal.config.kubernetes.io/index: '11'
-    {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}
+    {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kyverno
@@ -18054,7 +18054,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.10.0
     config.kubernetes.io/index: '12'
     internal.config.kubernetes.io/index: '12'
-    {{- trim (include "kyverno.crdAnnotations" .) | nindent 4 }}
+    {{- with .Values.crds.annotations }}{{ toYaml . | nindent 4 }}{{ end }}
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kyverno