diff --git a/build/jvm-rules/.bazelrc b/build/jvm-rules/.bazelrc
index ebf872b4408c..653af5a94f7e 100644
--- a/build/jvm-rules/.bazelrc
+++ b/build/jvm-rules/.bazelrc
@@ -12,19 +12,30 @@ build --tool_java_runtime_version=remotejdk_17
 
 common --@rules_jvm//:koltin_inc_threshold=0 --@rules_jvm//:java_inc_threshold=0
 
-# make sure you don't need to open file to read commpilation errors
+# make sure you don't need to open file to read compilation errors
 common --experimental_ui_max_stdouterr_bytes=-1
-common --symlink_prefix=/
 
 # disable deprecated WORKSPACE support
 common --noenable_workspace
-test --test_verbose_timeout_warnings --test_timeout=60 --test_output=all
 
-# Do not depend on external environment
-build --action_env BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+test --test_verbose_timeout_warnings --test_timeout=60 --test_output=all
 
 # https://www.buildbuddy.io/blog/debugging-slow-bazel-builds/
 common --nolegacy_important_outputs --remote_build_event_upload=minimal --remote_cache_async --remote_cache_compression
 
-# protobuf
-common --incompatible_enable_proto_toolchain_resolution
\ No newline at end of file
+common --symlink_prefix=/
+common --incompatible_enable_proto_toolchain_resolution
+
+# Do not depend on external environment
+build --action_env BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+
+# Remote-caches related
+common:remotecache --remote_cache=https://packages.jetbrains.team/files/p/ij/intellij-bazel-cache
+common --remote_upload_local_results=false
+common:ci --remote_upload_local_results=true
+
+# More debug on CI
+common:ci --announce_rc
+
+# TeamCity-specific options
+common:teamcity --show_progress_rate_limit=30