diff --git a/deploy/charts/backend/crds/kube-bind.io_apiservicebindingbundles.yaml b/deploy/charts/backend/templates/crds/kube-bind.io_apiservicebindingbundles.yaml
similarity index 99%
rename from deploy/charts/backend/crds/kube-bind.io_apiservicebindingbundles.yaml
rename to deploy/charts/backend/templates/crds/kube-bind.io_apiservicebindingbundles.yaml
index 849902618..cb72e4840 100644
--- a/deploy/charts/backend/crds/kube-bind.io_apiservicebindingbundles.yaml
+++ b/deploy/charts/backend/templates/crds/kube-bind.io_apiservicebindingbundles.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -147,3 +148,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/deploy/charts/backend/crds/kube-bind.io_apiservicebindings.yaml b/deploy/charts/backend/templates/crds/kube-bind.io_apiservicebindings.yaml
similarity index 99%
rename from deploy/charts/backend/crds/kube-bind.io_apiservicebindings.yaml
rename to deploy/charts/backend/templates/crds/kube-bind.io_apiservicebindings.yaml
index c443447f3..875ae9773 100644
--- a/deploy/charts/backend/crds/kube-bind.io_apiservicebindings.yaml
+++ b/deploy/charts/backend/templates/crds/kube-bind.io_apiservicebindings.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -461,3 +462,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/deploy/charts/backend/crds/kube-bind.io_apiserviceexportrequests.yaml b/deploy/charts/backend/templates/crds/kube-bind.io_apiserviceexportrequests.yaml
similarity index 99%
rename from deploy/charts/backend/crds/kube-bind.io_apiserviceexportrequests.yaml
rename to deploy/charts/backend/templates/crds/kube-bind.io_apiserviceexportrequests.yaml
index d5d06e244..1ae78dd89 100644
--- a/deploy/charts/backend/crds/kube-bind.io_apiserviceexportrequests.yaml
+++ b/deploy/charts/backend/templates/crds/kube-bind.io_apiserviceexportrequests.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -514,3 +515,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/deploy/charts/backend/crds/kube-bind.io_apiserviceexports.yaml b/deploy/charts/backend/templates/crds/kube-bind.io_apiserviceexports.yaml
similarity index 99%
rename from deploy/charts/backend/crds/kube-bind.io_apiserviceexports.yaml
rename to deploy/charts/backend/templates/crds/kube-bind.io_apiserviceexports.yaml
index 10f802367..a6c321d77 100644
--- a/deploy/charts/backend/crds/kube-bind.io_apiserviceexports.yaml
+++ b/deploy/charts/backend/templates/crds/kube-bind.io_apiserviceexports.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -750,3 +751,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/deploy/charts/backend/crds/kube-bind.io_apiserviceexporttemplates.yaml b/deploy/charts/backend/templates/crds/kube-bind.io_apiserviceexporttemplates.yaml
similarity index 99%
rename from deploy/charts/backend/crds/kube-bind.io_apiserviceexporttemplates.yaml
rename to deploy/charts/backend/templates/crds/kube-bind.io_apiserviceexporttemplates.yaml
index 2d254f037..edf749998 100644
--- a/deploy/charts/backend/crds/kube-bind.io_apiserviceexporttemplates.yaml
+++ b/deploy/charts/backend/templates/crds/kube-bind.io_apiserviceexporttemplates.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -335,3 +336,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/deploy/charts/backend/crds/kube-bind.io_apiservicenamespaces.yaml b/deploy/charts/backend/templates/crds/kube-bind.io_apiservicenamespaces.yaml
similarity index 99%
rename from deploy/charts/backend/crds/kube-bind.io_apiservicenamespaces.yaml
rename to deploy/charts/backend/templates/crds/kube-bind.io_apiservicenamespaces.yaml
index 1f84ff597..a2a314786 100644
--- a/deploy/charts/backend/crds/kube-bind.io_apiservicenamespaces.yaml
+++ b/deploy/charts/backend/templates/crds/kube-bind.io_apiservicenamespaces.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -122,3 +123,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/deploy/charts/backend/crds/kube-bind.io_bindableresourcesrequests.yaml b/deploy/charts/backend/templates/crds/kube-bind.io_bindableresourcesrequests.yaml
similarity index 99%
rename from deploy/charts/backend/crds/kube-bind.io_bindableresourcesrequests.yaml
rename to deploy/charts/backend/templates/crds/kube-bind.io_bindableresourcesrequests.yaml
index b628ca26e..88f475322 100644
--- a/deploy/charts/backend/crds/kube-bind.io_bindableresourcesrequests.yaml
+++ b/deploy/charts/backend/templates/crds/kube-bind.io_bindableresourcesrequests.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -222,3 +223,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/deploy/charts/backend/crds/kube-bind.io_boundschemas.yaml b/deploy/charts/backend/templates/crds/kube-bind.io_boundschemas.yaml
similarity index 99%
rename from deploy/charts/backend/crds/kube-bind.io_boundschemas.yaml
rename to deploy/charts/backend/templates/crds/kube-bind.io_boundschemas.yaml
index 80e87a042..1ccd84059 100644
--- a/deploy/charts/backend/crds/kube-bind.io_boundschemas.yaml
+++ b/deploy/charts/backend/templates/crds/kube-bind.io_boundschemas.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -466,3 +467,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/deploy/charts/backend/crds/kube-bind.io_clusterbindings.yaml b/deploy/charts/backend/templates/crds/kube-bind.io_clusterbindings.yaml
similarity index 99%
rename from deploy/charts/backend/crds/kube-bind.io_clusterbindings.yaml
rename to deploy/charts/backend/templates/crds/kube-bind.io_clusterbindings.yaml
index 6c12f18ab..acfc1dea8 100644
--- a/deploy/charts/backend/crds/kube-bind.io_clusterbindings.yaml
+++ b/deploy/charts/backend/templates/crds/kube-bind.io_clusterbindings.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -343,3 +344,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/deploy/charts/backend/crds/kube-bind.io_clusters.yaml b/deploy/charts/backend/templates/crds/kube-bind.io_clusters.yaml
similarity index 99%
rename from deploy/charts/backend/crds/kube-bind.io_clusters.yaml
rename to deploy/charts/backend/templates/crds/kube-bind.io_clusters.yaml
index 7dba0d0e9..3aec1e355 100644
--- a/deploy/charts/backend/crds/kube-bind.io_clusters.yaml
+++ b/deploy/charts/backend/templates/crds/kube-bind.io_clusters.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -104,3 +105,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/deploy/charts/backend/crds/kube-bind.io_collections.yaml b/deploy/charts/backend/templates/crds/kube-bind.io_collections.yaml
similarity index 99%
rename from deploy/charts/backend/crds/kube-bind.io_collections.yaml
rename to deploy/charts/backend/templates/crds/kube-bind.io_collections.yaml
index 1b262685d..006cb2e4b 100644
--- a/deploy/charts/backend/crds/kube-bind.io_collections.yaml
+++ b/deploy/charts/backend/templates/crds/kube-bind.io_collections.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -131,3 +132,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/deploy/charts/backend/values.yaml b/deploy/charts/backend/values.yaml
index 0dba4ebe0..4983271ff 100644
--- a/deploy/charts/backend/values.yaml
+++ b/deploy/charts/backend/values.yaml
@@ -262,3 +262,8 @@ tolerations: []
 
 # -- Affinity rules for pod scheduling
 affinity: {}
+
+# CRD configuration
+crds:
+  # -- Install CustomResourceDefinitions
+  install: true
diff --git a/hack/tools.checksums b/hack/tools.checksums
index e41736f76..b8c0583f8 100644
--- a/hack/tools.checksums
+++ b/hack/tools.checksums
@@ -6,6 +6,7 @@ gotestsum|GOARCH=amd64;GOOS=linux|ee25248e6f5073cad0b7a712c97ed473adb7420f7eefad
 gotestsum|GOARCH=arm64;GOOS=linux|7a5e7f8cb5e2126be563b7c7182cc4522fbc65408a99df82d156d30e997b8705
 helm-docs|ARCH=arm64;OS=Darwin|911f2763de0201b4870b3468247ef794d9401aa8d4aa285089bbee040d4ae9c4
 helm|GOARCH=amd64;GOOS=linux|c153fd9c1173f39aefe8e9aa9f00fd3daf6b40c8ea01e94a0d2f2c1787fc60e0
+helm|GOARCH=arm64;GOOS=darwin|1de70a09e537814ce04aeae15204dcfd7a2fe1ac842e7e9ac0ebcee27b33278f
 kcp|GOARCH=amd64;GOOS=linux|367525b4334e30f598054a62c8f10f04c21afa480c1700d0a9dbb8c905c931a5
 kcp|GOARCH=arm64;GOOS=darwin|463dd70f665baac198f2c6b979bd9dc5e4349636711509dd83fd96b05d1d0bb5
 kcp|GOARCH=arm64;GOOS=linux|44e5ac1c58642b7cffa88796adf9478a9b4110e61876e83237e419fb244216c7
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
index 0d697902d..e4008e5f9 100755
--- a/hack/update-codegen.sh
+++ b/hack/update-codegen.sh
@@ -38,7 +38,17 @@ YAML_PATCH="$(UGET_PRINT_PATH=absolute make --no-print-directory install-yaml-pa
       rbac:roleName=manager-role \
       webhook \
       paths="./..." \
-      output:crd:artifacts:config=../../deploy/charts/backend/crds
+      output:crd:artifacts:config=../../deploy/charts/backend/templates/crds
+
+   # Wrap generated CRDs in helm conditional
+   for CRD in ../../deploy/charts/backend/templates/crds/*.yaml; do
+      if [ -f "$CRD" ]; then
+         echo '{{- if .Values.crds.install }}' > "${CRD}.tmp"
+         cat "${CRD}" >> "${CRD}.tmp"
+         echo '{{- end }}' >> "${CRD}.tmp"
+         mv "${CRD}.tmp" "${CRD}"
+      fi
+   done
 
    # Generate RBAC manifests for Helm chart from backend controllers
    "$CONTROLLER_GEN" \