diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index dbeccec154..8bff0bcd2f 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -99,7 +99,8 @@ jobs:
       - name: Run chart-testing (install)
         run: |
           kubectl create namespace kyverno
-          ct install --target-branch=main --namespace=kyverno
+          helm install kyverno-crds charts/kyverno-crds -n kyverno
+          ct install --target-branch=main --namespace=kyverno --charts charts/kyverno
 
       - name: Debug failure
         if: failure()
diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml
index b804564db5..62a0db69c3 100644
--- a/.github/workflows/helm-release.yaml
+++ b/.github/workflows/helm-release.yaml
@@ -4,6 +4,7 @@ on:
     branches:
       - 'main'
     paths:
+      - 'charts/kyverno-crds/Chart.yaml'
       - 'charts/kyverno/Chart.yaml'
       - '.github/workflows/helm-release.yaml'
 
diff --git a/Makefile b/Makefile
index 45de4ef429..9f0be17643 100644
--- a/Makefile
+++ b/Makefile
@@ -210,7 +210,7 @@ godownloader:
 # kustomize-crd will create install.yaml
 kustomize-crd:
 	# Create CRD for helm deployment Helm
-	kustomize build ./definitions/crds > ./charts/kyverno/crds/crds.yaml
+	kustomize build ./definitions/crds > ./charts/kyverno-crds/templates/crds.yaml
 	# Generate install.yaml that have all resources for kyverno
 	kustomize build ./definitions > ./definitions/install.yaml
 	# Generate install_debug.yaml that for developer testing
diff --git a/charts/kyverno-crds/Chart.yaml b/charts/kyverno-crds/Chart.yaml
new file mode 100644
index 0000000000..39cb84977e
--- /dev/null
+++ b/charts/kyverno-crds/Chart.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+name: kyverno-crds
+version: v2.0.2
+appVersion: v1.4.2
+icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png
+description: Kubernetes Native Policy Management CRDs
+keywords:
+  - kubernetes
+  - nirmata
+  - policy agent
+  - validating webhook
+  - admissions controller
+home: https://kyverno.io/
+sources:
+  - https://github.com/kyverno/kyverno
+maintainers:
+  - name: Nirmata
+    url: https://kyverno.io/
+engine: gotpl
+kubeVersion: ">=1.10.0-0"
diff --git a/charts/kyverno/crds/crds.yaml b/charts/kyverno-crds/templates/crds.yaml
similarity index 100%
rename from charts/kyverno/crds/crds.yaml
rename to charts/kyverno-crds/templates/crds.yaml
diff --git a/charts/kyverno-crds/values.yaml b/charts/kyverno-crds/values.yaml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/charts/kyverno/Chart.yaml b/charts/kyverno/Chart.yaml
index 10c0c4a2ca..658b9efdd8 100644
--- a/charts/kyverno/Chart.yaml
+++ b/charts/kyverno/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kyverno
-version: v2.0.1
+version: v2.0.2
 appVersion: v1.4.2
 icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png
 description: Kubernetes Native Policy Management