diff --git a/charts/kubewarden-controller/Chart.yaml b/charts/kubewarden-controller/Chart.yaml
index ff8e0055..91915922 100644
--- a/charts/kubewarden-controller/Chart.yaml
+++ b/charts/kubewarden-controller/Chart.yaml
@@ -21,7 +21,7 @@ maintainers:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.7.0-rc3
+version: 1.6.0-rc3
 # This is the version of Kubewarden stack
 appVersion: v1.7.0-rc3
 annotations:
diff --git a/charts/kubewarden-crds/Chart.yaml b/charts/kubewarden-crds/Chart.yaml
index 0ba705f0..f8bc2c79 100644
--- a/charts/kubewarden-crds/Chart.yaml
+++ b/charts/kubewarden-crds/Chart.yaml
@@ -20,7 +20,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.5.0-rc3
+version: 1.4.0-rc3
 # This is the version of Kubewarden stack
 appVersion: v1.7.0-rc3
 annotations:
diff --git a/charts/kubewarden-crds/templates/clusterpolicyreports.yaml b/charts/kubewarden-crds/templates/clusterpolicyreports.yaml
index 932a3b8d..ddb0c1c4 100644
--- a/charts/kubewarden-crds/templates/clusterpolicyreports.yaml
+++ b/charts/kubewarden-crds/templates/clusterpolicyreports.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.installPolicyReportCRDs }}
+{{- if or .Values.installPolicyReportCRDs (not (hasKey .Values "installPolicyReportCRDs")) }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
diff --git a/charts/kubewarden-crds/templates/policyreports.yaml b/charts/kubewarden-crds/templates/policyreports.yaml
index c24850ae..b59c4d66 100644
--- a/charts/kubewarden-crds/templates/policyreports.yaml
+++ b/charts/kubewarden-crds/templates/policyreports.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.installPolicyReportCRDs }}
+{{- if or .Values.installPolicyReportCRDs (not (hasKey .Values "installPolicyReportCRDs")) }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
diff --git a/charts/kubewarden-defaults/Chart.yaml b/charts/kubewarden-defaults/Chart.yaml
index 1b79bdd3..db6c55c0 100644
--- a/charts/kubewarden-defaults/Chart.yaml
+++ b/charts/kubewarden-defaults/Chart.yaml
@@ -20,7 +20,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.8.0-rc3
+version: 1.7.0-rc3
 # This is the version of Kubewarden stack
 appVersion: v1.7.0-rc3
 annotations: