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
diff --git a/third_party/bazelrc/aspect/convenience.bazelrc b/third_party/bazelrc/aspect/convenience.bazelrc
index 796675a..ec87847 100644
--- a/third_party/bazelrc/aspect/convenience.bazelrc
+++ b/third_party/bazelrc/aspect/convenience.bazelrc
@@ -1,17 +1,17 @@
 # Attempt to build & test every target whose prerequisites were successfully built.
 # Docs: https://bazel.build/docs/user-manual#keep-going
-build --keep_going
+common --keep_going
 
 # Output test errors to stderr so users don't have to `cat` or open test failure log files when test
 # fail. This makes the log noisier in exchange for reducing the time-to-feedback on test failures for
 # users.
 # Docs: https://bazel.build/docs/user-manual#test-output
-test --test_output=errors
+common --test_output=errors
 
 # Show the output files created by builds that requested more than one target. This helps users
 # locate the build outputs in more cases
 # Docs: https://bazel.build/docs/user-manual#show-result
-build --show_result=20
+common --show_result=20
 
 # Bazel picks up host-OS-specific config lines from bazelrc files. For example, if the host OS is
 # Linux and you run bazel build, Bazel picks up lines starting with build:linux. Supported OS
diff --git a/third_party/bazelrc/aspect/correctness.bazelrc b/third_party/bazelrc/aspect/correctness.bazelrc
index e550193..8248d63 100644
--- a/third_party/bazelrc/aspect/correctness.bazelrc
+++ b/third_party/bazelrc/aspect/correctness.bazelrc
@@ -3,14 +3,14 @@
 # It should be flipped to `--remote_upload_local_results` on CI
 # by using `--bazelrc=.aspect/bazelrc/ci.bazelrc`.
 # Docs: https://bazel.build/reference/command-line-reference#flag--remote_upload_local_results
-build --noremote_upload_local_results
+common --noremote_upload_local_results
 
 # Don't allow network access for build actions in the sandbox.
 # Ensures that you don't accidentally make non-hermetic actions/tests which depend on remote
 # services.
 # Developers should tag targets with `tags=["requires-network"]` to opt-out of the enforcement.
 # Docs: https://bazel.build/reference/command-line-reference#flag--sandbox_default_allow_network
-build --sandbox_default_allow_network=false
+common --sandbox_default_allow_network=false
 
 # Warn if a test's timeout is significantly longer than the test's actual execution time.
 # Bazel's default for test_timeout is medium (5 min), but most tests should instead be short (1 min).
@@ -19,7 +19,7 @@
 # For instance, a test that normally executes in a minute or two should not have a timeout of
 # ETERNAL or LONG as these are much, much too generous.
 # Docs: https://bazel.build/docs/user-manual#test-verbose-timeout-warnings
-test --test_verbose_timeout_warnings
+common --test_verbose_timeout_warnings
 
 # Allow the Bazel server to check directory sources for changes. Ensures that the Bazel server
 # notices when a directory changes, if you have a directory listed in the srcs of some target.
@@ -33,14 +33,14 @@
 # Allow exclusive tests to run in the sandbox. Fixes a bug where Bazel doesn't enable sandboxing for
 # tests with `tags=["exclusive"]`.
 # Docs: https://bazel.build/reference/command-line-reference#flag--incompatible_exclusive_test_sandboxed
-test --incompatible_exclusive_test_sandboxed
+common --incompatible_exclusive_test_sandboxed
 
 # Use a static value for `PATH` and does not inherit `LD_LIBRARY_PATH`. Doesn't let environment
 # variables like `PATH` sneak into the build, which can cause massive cache misses when they change.
 # Use `--action_env=ENV_VARIABLE` if you want to inherit specific environment variables from the
 # client, but note that doing so can prevent cross-user caching if a shared cache is used.
 # Docs: https://bazel.build/reference/command-line-reference#flag--incompatible_strict_action_env
-build --incompatible_strict_action_env
+common --incompatible_strict_action_env
 
 # Do not automatically create `__init__.py` files in the runfiles of Python targets. Fixes the wrong
 # default that comes from Google's internal monorepo by using `__init__.py` to delimit a Python
@@ -48,7 +48,7 @@
 # default), it is treated as false if and only if this flag is set. See
 # https://github.com/bazelbuild/bazel/issues/10076.
 # Docs: https://bazel.build/reference/command-line-reference#flag--incompatible_default_to_explicit_init_py
-build --incompatible_default_to_explicit_init_py
+common --incompatible_default_to_explicit_init_py
 
 # Set default value of `allow_empty` to `False` in `glob()`. This prevents a common mistake when
 # attempting to use `glob()` to match files in a subdirectory that is opaque to the current package
@@ -60,5 +60,5 @@
 # downloaded on test result cache hits when --remote_download_minimal is enabled, making it impossible
 # to generate a full coverage report.
 # Docs: https://bazel.build/reference/command-line-reference#flag--experimental_fetch_all_coverage_outputs
-# detching remote cache results
-test --experimental_fetch_all_coverage_outputs
+# ditching remote cache results
+common --experimental_fetch_all_coverage_outputs
diff --git a/third_party/bazelrc/aspect/performance.bazelrc b/third_party/bazelrc/aspect/performance.bazelrc
index 56749dd..1a9a20b 100644
--- a/third_party/bazelrc/aspect/performance.bazelrc
+++ b/third_party/bazelrc/aspect/performance.bazelrc
@@ -3,7 +3,7 @@
 # build.
 # No longer experimental in Bazel 6: https://github.com/bazelbuild/bazel/commit/c1a95501a5611878e5cc43a3cc531f2b9e47835b
 # Docs: https://bazel.build/reference/command-line-reference#flag--reuse_sandbox_directories
-build --experimental_reuse_sandbox_directories
+common --experimental_reuse_sandbox_directories
 
 # Avoid creating a runfiles tree for binaries or tests until it is needed.
 # Docs: https://bazel.build/reference/command-line-reference#flag--build_runfile_links
@@ -12,7 +12,7 @@
 # This may break local workflows that `build` a binary target, then run the resulting program
 # outside of `bazel run`. In those cases, the script will need to call
 # `bazel build --build_runfile_links //my/binary:target` and then execute the resulting program.
-build --nobuild_runfile_links
+common --nobuild_runfile_links
 
 # Needed prior to Bazel 8; see
 # https://github.com/bazelbuild/bazel/issues/20577