diff --git a/Makefile b/Makefile
index 3ad05e1eed..f5fa1196c4 100644
--- a/Makefile
+++ b/Makefile
@@ -427,6 +427,10 @@ generate_grafana_scripts:
 
 bazel_ci_prepare:
 	bazel $(BAZEL_GLOBAL_CONFIG) run $(BAZEL_CMD_CONFIG) //:gazelle
+	bazel $(BAZEL_GLOBAL_CONFIG) run $(BAZEL_CMD_CONFIG) //:gazelle -- update-repos -from_file=go.mod -to_macro DEPS.bzl%go_deps  -build_file_proto_mode=disable
+	bazel $(BAZEL_GLOBAL_CONFIG) run $(BAZEL_CMD_CONFIG)  \
+		--run_under="cd $(CURDIR) && " \
+		 //tools/tazel:tazel
 
 bazel_prepare:
 	bazel run //:gazelle
diff --git a/tools/check/check-bazel-prepare.sh b/tools/check/check-bazel-prepare.sh
index 8e9da57fc8..c7ac2cc8bd 100755
--- a/tools/check/check-bazel-prepare.sh
+++ b/tools/check/check-bazel-prepare.sh
@@ -21,7 +21,7 @@
 set -euo pipefail
 
 before_checksum=`find . -type f \( -name *.bazel -o -name *.bzl \) -exec md5sum {} \;| sort -k 2`
-make bazel_prepare
+make bazel_ci_prepare
 after_checksum=`find . -type f \( -name *.bazel -o -name *.bzl \) -exec md5sum {} \;| sort -k 2`
 if [ "$before_checksum" != "$after_checksum" ]
 then