diff --git a/Makefile b/Makefile
index 68f0e4dc1c..a1141dcbfd 100644
--- a/Makefile
+++ b/Makefile
@@ -883,6 +883,11 @@ gen-crds: $(BUILD_OPENAPI2CRD)
 	$(OPENAPI2CRD) --config tools/openapi2crd/config.yaml \
 	--output $(realpath .)/config/generated/crd/bases/crds.yaml
 
+gen-crds-override: $(BUILD_OPENAPI2CRD)
+	@echo "==> Generating CRDs..."
+	$(OPENAPI2CRD) --config tools/openapi2crd/config.yaml \
+	--output $(realpath .)/config/generated/crd/bases/crds.yaml --force
+
 gen-go-types:
 	@echo "==> Generating Go models from CRDs..."
 	$(CRD2GO) --input $(realpath .)/config/generated/crd/bases/crds.yaml \
@@ -891,10 +896,18 @@ gen-go-types:
 run-scaffolder: $(BUILD_SCAFFOLDER)
 	@echo "==> Generating Go controller scaffolding and indexers..."
 	$(SCAFFOLDER) --input $(realpath .)/config/generated/crd/bases/crds.yaml \
-	--all --indexer-out $(realpath .)/internal/generated/controller \
-	--controller-out $(realpath .)/internal/generated/indexer
+	--all --indexer-out $(realpath .)/internal/generated/indexers \
+	--controller-out $(realpath .)/internal/generated/controller
+
+run-scaffolder-override: $(BUILD_SCAFFOLDER)
+	@echo "==> Generating Go controller scaffolding and indexers..."
+	$(SCAFFOLDER) --input $(realpath .)/config/generated/crd/bases/crds.yaml \
+	--all --override --indexer-out $(realpath .)/internal/generated/indexers \
+	--controller-out $(realpath .)/internal/generated/controller
 
 gen-all: gen-crds gen-go-types run-scaffolder
 
+gen-all-override: gen-crds-override gen-go-types run-scaffolder-override
+
 build-autogen: gen-all $(ALL_IN_ONE_AUTOGENERATED_CONFIG)
 	EXPERIMENTAL=1 VERSION=$(shell $(JQ) -r .next $(VERSION_FILE))-EXPERIMENTAL-${GITCOMMIT} $(MAKE) image
\ No newline at end of file