diff --git a/RELEASE.md b/RELEASE.md
index 27dd35886..23e95297f 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -22,7 +22,9 @@ In order to release `vX.Y.Z` of the `cloudnative-pg` chart, follow these steps:
        [remoteBuild](https://github.com/kubernetes-sigs/kustomize/blob/master/examples/remoteBuild.md)
        running: `kustomize build
        https://github.com/cloudnative-pg/cloudnative-pg/tree/release-1.16/config/helm/\?ref=v1.16.0`,
-       take care to set the correct version as ref (v1.15.1 in the example command).
+       take care to set the correct version as ref (v1.15.1 in the example
+       command). Also notice that crd generation should be guarded from
+       `.Values.crds.create`, so please pay attention to maintain that.
     1. all the needed files in the
        [templates](./charts/cloudnative-pg/templates) directory, you can diff
        the previous release yaml w.r.t. the new one to know what should be
diff --git a/charts/cloudnative-pg/README.md b/charts/cloudnative-pg/README.md
index f20617417..12075cf77 100644
--- a/charts/cloudnative-pg/README.md
+++ b/charts/cloudnative-pg/README.md
@@ -27,6 +27,7 @@ CloudNativePG Helm Chart
 | config.data | object | `{}` |  |
 | config.name | string | `"cnpg-controller-manager-config"` |  |
 | config.secret | bool | `false` | Specifies whether it should be stored in a secret, instead of a configmap |
+| crds.create | bool | `true` |  |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"ghcr.io/cloudnative-pg/cloudnative-pg"` |  |
diff --git a/charts/cloudnative-pg/templates/crds/crds.yaml b/charts/cloudnative-pg/templates/crds/crds.yaml
index 21c6ea7d1..854238437 100644
--- a/charts/cloudnative-pg/templates/crds/crds.yaml
+++ b/charts/cloudnative-pg/templates/crds/crds.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -10267,3 +10268,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
+{{- end }}
diff --git a/charts/cloudnative-pg/values.schema.json b/charts/cloudnative-pg/values.schema.json
index 5321b99d2..fc61894a7 100644
--- a/charts/cloudnative-pg/values.schema.json
+++ b/charts/cloudnative-pg/values.schema.json
@@ -28,6 +28,14 @@
                 }
             }
         },
+        "crds": {
+            "type": "object",
+            "properties": {
+                "create": {
+                    "type": "boolean"
+                }
+            }
+        },
         "fullnameOverride": {
             "type": "string"
         },
diff --git a/charts/cloudnative-pg/values.yaml b/charts/cloudnative-pg/values.yaml
index 1a700145f..98a54c25a 100644
--- a/charts/cloudnative-pg/values.yaml
+++ b/charts/cloudnative-pg/values.yaml
@@ -29,6 +29,9 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
+crds:
+  create: true
+
 webhook:
   port: 9443
   mutating:
diff --git a/charts/cnpg-sandbox/README.md b/charts/cnpg-sandbox/README.md
index 94c64dc46..bea3fba59 100644
--- a/charts/cnpg-sandbox/README.md
+++ b/charts/cnpg-sandbox/README.md
@@ -1,6 +1,6 @@
 # cnpg-sandbox
 
-![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
+![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
 
 A sandbox for CloudNativePG
 
@@ -20,7 +20,7 @@ A sandbox for CloudNativePG
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://cloudnative-pg.github.io/charts | cloudnative-pg | 0.13.0 |
+| https://cloudnative-pg.github.io/charts | cloudnative-pg | 0.14.0 |
 | https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 32.2.1 |
 
 ## Values
@@ -34,4 +34,4 @@ A sandbox for CloudNativePG
 | kube-prometheus-stack.grafana.adminPassword | string | `"prom-operator"` | the grafana admin password |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
+Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)