diff --git a/third_party/bazelrc/aspect/ci.bazelrc b/third_party/bazelrc/aspect/ci.bazelrc
index 11aae33..dd6457e 100644
--- a/third_party/bazelrc/aspect/ci.bazelrc
+++ b/third_party/bazelrc/aspect/ci.bazelrc
@@ -15,30 +15,30 @@
 # beginning of each Bazel invocation. This is very useful on CI to be able to inspect what Bazel rc
 # settings are being applied on each run.
 # Docs: https://bazel.build/docs/user-manual#announce-rc
-build --announce_rc
+common --announce_rc
 
 # Add a timestamp to each message generated by Bazel specifying the time at which the message was
 # displayed.
 # Docs: https://bazel.build/docs/user-manual#show-timestamps
-build --show_timestamps
+common --show_timestamps
 
 # Only show progress every 60 seconds on CI.
 # We want to find a compromise between printing often enough to show that the build isn't stuck,
 # but not so often that we produce a long log file that requires a lot of scrolling.
 # https://bazel.build/reference/command-line-reference#flag--show_progress_rate_limit
-build --show_progress_rate_limit=60
+common --show_progress_rate_limit=60
 
 # Use cursor controls in screen output.
 # Docs: https://bazel.build/docs/user-manual#curses
-build --curses=yes
+common --curses=yes
 
 # Use colors to highlight output on the screen. Set to `no` if your CI does not display colors.
 # Docs: https://bazel.build/docs/user-manual#color
-build --color=yes
+common --color=yes
 
 # The terminal width in columns. Configure this to override the default value based on what your CI system renders.
 # Docs: https://github.com/bazelbuild/bazel/blob/1af61b21df99edc2fc66939cdf14449c2661f873/src/main/java/com/google/devtools/build/lib/runtime/UiOptions.java#L151
-build --terminal_columns=143
+common --terminal_columns=143
 
 ######################################
 # Generic remote cache configuration #
@@ -46,21 +46,21 @@
 
 # Only download remote outputs of top level targets to the local machine.
 # Docs: https://bazel.build/reference/command-line-reference#flag--remote_download_toplevel
-build --remote_download_toplevel
+common --remote_download_toplevel
 
 # The maximum amount of time to wait for remote execution and cache calls.
 # https://bazel.build/reference/command-line-reference#flag--remote_timeout
-build --remote_timeout=3600
+common --remote_timeout=3600
 
 # Upload locally executed action results to the remote cache.
 # Docs: https://bazel.build/reference/command-line-reference#flag--remote_upload_local_results
-build --remote_upload_local_results
+common --remote_upload_local_results
 
 # Fall back to standalone local execution strategy if remote execution fails. If the grpc remote
 # cache connection fails, it will fail the build, add this so it falls back to the local cache.
 # Docs: https://bazel.build/reference/command-line-reference#flag--remote_local_fallback
-build --remote_local_fallback
+common --remote_local_fallback
 
 # Fixes builds hanging on CI that get the TCP connection closed without sending RST packets.
 # Docs: https://bazel.build/reference/command-line-reference#flag--grpc_keepalive_time
-build --grpc_keepalive_time=30s
+common --grpc_keepalive_time=30s