diff --git a/Makefile b/Makefile
index 75cf7ebb5f2e..a03f37077238 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,7 @@ clientset: ## Generate a typed clientset
 		--listers-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
 		--output-package sigs.k8s.io/cluster-api/pkg/client/informers_generated \
 		--go-header-file=./hack/boilerplate.go.txt
+	$(MAKE) gazelle
 
 .PHONY: clean
 clean: ## Remove all generated files
diff --git a/hack/verify_clientset.sh b/hack/verify_clientset.sh
index fd82b41a3ef7..939c8734814e 100755
--- a/hack/verify_clientset.sh
+++ b/hack/verify_clientset.sh
@@ -35,12 +35,10 @@ mkdir -p "${TMP_DIFFROOT}"
 cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
 
 make clientset
-find "${TMP_DIFFROOT}" -name *.bazel -delete
 
 echo "diffing ${DIFFROOT} against freshly generated codegen"
 ret=0
 diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" -x '*.bazel' -x 'BUILD' || ret=$?
-cp -a "${TMP_DIFFROOT}"/* "${DIFFROOT}"
 if [[ $ret -eq 0 ]]
 then
     echo "${DIFFROOT} up to date."