diff --git a/.bazelrc b/.bazelrc
index a495eebda336b..78bab750ffea5 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -5,16 +5,19 @@ build --java_language_version=17
 build --java_runtime_version=17
 build --tool_java_language_version=17
 build --tool_java_runtime_version=17
+build:ci --color=yes
+run:ci --color=yes
 
-run --color=yes
 build:release --workspace_status_command=./build/print-workspace-status.sh --stamp
 build:release --config=ci
 build --incompatible_strict_action_env --incompatible_enable_cc_toolchain_resolution
 build:ci --experimental_remote_cache_compression
+test:ci --color=yes
 test:ci --verbose_failures
 test:ci --test_env=GO_TEST_WRAP_TESTV=1 --test_verbose_timeout_warnings
 test:ci --test_env=TZ=Asia/Shanghai --test_output=errors --experimental_ui_max_stdouterr_bytes=104857600
 
+build:race --config=ci
 build:race --@io_bazel_rules_go//go/config:race --test_env=GORACE=halt_on_error=1 --test_sharding_strategy=disabled
 test:race --test_timeout=1200,6000,18000,72000
 
diff --git a/Makefile b/Makefile
index 3276c6d6e9579..6ede605518dd3 100644
--- a/Makefile
+++ b/Makefile
@@ -392,7 +392,7 @@ bazel_ci_prepare:
 
 bazel_prepare:
 	bazel run //:gazelle
-	bazel run //:gazelle -- update-repos -from_file=go.mod -build_file_proto_mode=disable
+	bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro DEPS.bzl%go_deps  -build_file_proto_mode=disable
 
 bazel_test: failpoint-enable bazel_ci_prepare
 	bazel $(BAZEL_GLOBAL_CONFIG) test $(BAZEL_CMD_CONFIG) \