diff --git a/hack/verify-upgrade.sh b/hack/verify-upgrade.sh
index be7b6ac27..2b6d42922 100755
--- a/hack/verify-upgrade.sh
+++ b/hack/verify-upgrade.sh
@@ -76,7 +76,7 @@ $helm upgrade \
     --install \
     --wait \
     --namespace "${NAMESPACE}" \
-    --set installCRDs=true \
+    --set crds.enabled=true \
     --create-namespace \
     --version "${LATEST_RELEASE}" \
     "$RELEASE_NAME" \
diff --git a/make/e2e-setup.mk b/make/e2e-setup.mk
index 8bf021bf8..3ed8ce1ad 100644
--- a/make/e2e-setup.mk
+++ b/make/e2e-setup.mk
@@ -294,7 +294,7 @@ e2e-setup-certmanager: $(bin_dir)/cert-manager.tgz $(foreach binaryname,controll
 		--set webhook.image.tag="$(TAG)" \
 		--set acmesolver.image.tag="$(TAG)" \
 		--set startupapicheck.image.tag="$(TAG)" \
-		--set installCRDs=true \
+		--set crds.enabled=true \
 		--set featureGates="$(feature_gates_controller)" \
 		--set "extraArgs={--kube-api-qps=9000,--kube-api-burst=9000,--concurrent-workers=200}" \
 		--set webhook.featureGates="$(feature_gates_webhook)" \
diff --git a/make/ko.mk b/make/ko.mk
index a2e685634..93f62942c 100644
--- a/make/ko.mk
+++ b/make/ko.mk
@@ -87,5 +87,5 @@ ko-deploy-certmanager: $(bin_dir)/cert-manager.tgz $(KO_IMAGE_REFS)
 		--set webhook.image.digest="$(shell $(YQ) .digest $(bin_dir)/scratch/ko/webhook.yaml)" \
 		--set startupapicheck.image.repository="$(shell $(YQ) .repository $(bin_dir)/scratch/ko/startupapicheck.yaml)" \
 		--set startupapicheck.image.digest="$(shell $(YQ) .digest $(bin_dir)/scratch/ko/startupapicheck.yaml)" \
-		--set installCRDs=true \
+		--set crds.enabled=true \
 		--set "extraArgs={--acme-http01-solver-image=$(ACME_HTTP01_SOLVER_IMAGE)}"
diff --git a/make/manifests.mk b/make/manifests.mk
index e22658ec3..580569beb 100644
--- a/make/manifests.mk
+++ b/make/manifests.mk
@@ -138,7 +138,7 @@ $(bin_dir)/scratch/yaml/cert-manager.noncrd.unlicensed.yaml: $(bin_dir)/cert-man
 
 $(bin_dir)/scratch/yaml/cert-manager.all.unlicensed.yaml: $(bin_dir)/cert-manager-$(RELEASE_VERSION).tgz | $(NEEDS_HELM) $(bin_dir)/scratch/yaml
 	@# The sed command removes the first line but only if it matches "---", which helm adds
-	$(HELM) template --api-versions="" --namespace=cert-manager --set="installCRDs=true" --set="creator=static" --set="startupapicheck.enabled=false" cert-manager $< | \
+	$(HELM) template --api-versions="" --namespace=cert-manager --set="crds.enabled=true" --set="creator=static" --set="startupapicheck.enabled=false" cert-manager $< | \
 		sed -e "1{/^---$$/d;}" > $@
 
 $(bin_dir)/scratch/yaml/cert-manager.crds.unlicensed.yaml: $(bin_dir)/scratch/yaml/cert-manager.all.unlicensed.yaml | $(NEEDS_GO) $(bin_dir)/scratch/yaml