diff --git a/e2e/bzlmod/.aspect/bazelrc b/e2e/bzlmod/.aspect/bazelrc
deleted file mode 120000
index 2d2e61f06..000000000
--- a/e2e/bzlmod/.aspect/bazelrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../.aspect/bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod/.aspect/bazelrc/bazel6.bazelrc b/e2e/bzlmod/.aspect/bazelrc/bazel6.bazelrc
new file mode 120000
index 000000000..eed5e30c5
--- /dev/null
+++ b/e2e/bzlmod/.aspect/bazelrc/bazel6.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/bazel6.bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod/.aspect/bazelrc/convenience.bazelrc b/e2e/bzlmod/.aspect/bazelrc/convenience.bazelrc
new file mode 120000
index 000000000..524b51f4e
--- /dev/null
+++ b/e2e/bzlmod/.aspect/bazelrc/convenience.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/convenience.bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod/.aspect/bazelrc/correctness.bazelrc b/e2e/bzlmod/.aspect/bazelrc/correctness.bazelrc
new file mode 120000
index 000000000..f139b5d9f
--- /dev/null
+++ b/e2e/bzlmod/.aspect/bazelrc/correctness.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/correctness.bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod/.aspect/bazelrc/debug.bazelrc b/e2e/bzlmod/.aspect/bazelrc/debug.bazelrc
new file mode 120000
index 000000000..e9fb0cf99
--- /dev/null
+++ b/e2e/bzlmod/.aspect/bazelrc/debug.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/debug.bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod/.aspect/bazelrc/javascript.bazelrc b/e2e/bzlmod/.aspect/bazelrc/javascript.bazelrc
new file mode 120000
index 000000000..69810851d
--- /dev/null
+++ b/e2e/bzlmod/.aspect/bazelrc/javascript.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/javascript.bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod/.aspect/bazelrc/performance.bazelrc b/e2e/bzlmod/.aspect/bazelrc/performance.bazelrc
new file mode 120000
index 000000000..719484d5d
--- /dev/null
+++ b/e2e/bzlmod/.aspect/bazelrc/performance.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/performance.bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod/.bazelignore b/e2e/bzlmod/.bazelignore
deleted file mode 100644
index 9877b311d..000000000
--- a/e2e/bzlmod/.bazelignore
+++ /dev/null
@@ -1 +0,0 @@
-e2e/bzlmod/.aspect/bazelrc
diff --git a/e2e/bzlmod/.bazelrc b/e2e/bzlmod/.bazelrc
index b3a24e860..ddbbd92f3 100644
--- a/e2e/bzlmod/.bazelrc
+++ b/e2e/bzlmod/.bazelrc
@@ -1 +1,22 @@
+# Bazel settings that apply to this repository.
+# Settings that apply only to CI are in .aspect/bazelrc/ci.bazelrc
+
+# Import Aspect bazelrc presets
+import %workspace%/.aspect/bazelrc/convenience.bazelrc
+import %workspace%/.aspect/bazelrc/correctness.bazelrc
+import %workspace%/.aspect/bazelrc/performance.bazelrc
+import %workspace%/.aspect/bazelrc/debug.bazelrc
+import %workspace%/.aspect/bazelrc/javascript.bazelrc
+
+# Use a try-import for Bazel 6 settings since this repository is also tested against Bazel 5 on CI
+try-import %workspace%/.aspect/bazelrc/bazel6.bazelrc
+
+### PROJECT SPECIFIC OPTIONS ###
+
 common --experimental_enable_bzlmod
+
+# Load any settings & overrides specific to the current user from `.aspect/bazelrc/user.bazelrc`.
+# This file should appear in `.gitignore` so that settings are not shared with team members. This
+# should be last statement in this config so the user configuration is able to overwrite flags from
+# this file. See https://bazel.build/configure/best-practices#bazelrc-file.
+try-import %workspace%/.aspect/bazelrc/user.bazelrc
diff --git a/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/bazel6.bazelrc b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/bazel6.bazelrc
new file mode 120000
index 000000000..eed5e30c5
--- /dev/null
+++ b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/bazel6.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/bazel6.bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/convenience.bazelrc b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/convenience.bazelrc
new file mode 120000
index 000000000..524b51f4e
--- /dev/null
+++ b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/convenience.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/convenience.bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/correctness.bazelrc b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/correctness.bazelrc
new file mode 120000
index 000000000..f139b5d9f
--- /dev/null
+++ b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/correctness.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/correctness.bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/debug.bazelrc b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/debug.bazelrc
new file mode 120000
index 000000000..e9fb0cf99
--- /dev/null
+++ b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/debug.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/debug.bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/javascript.bazelrc b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/javascript.bazelrc
new file mode 120000
index 000000000..69810851d
--- /dev/null
+++ b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/javascript.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/javascript.bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/performance.bazelrc b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/performance.bazelrc
new file mode 120000
index 000000000..719484d5d
--- /dev/null
+++ b/e2e/bzlmod_write_source_files_external/.aspect/bazelrc/performance.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/performance.bazelrc
\ No newline at end of file
diff --git a/e2e/bzlmod_write_source_files_external/.aspect/cli b/e2e/bzlmod_write_source_files_external/.aspect/cli
new file mode 120000
index 000000000..0754375d1
--- /dev/null
+++ b/e2e/bzlmod_write_source_files_external/.aspect/cli
@@ -0,0 +1 @@
+../../../.aspect/cli
\ No newline at end of file
diff --git a/e2e/bzlmod_write_source_files_external/.bazelrc b/e2e/bzlmod_write_source_files_external/.bazelrc
index 3ce91d272..a1b3c008a 100644
--- a/e2e/bzlmod_write_source_files_external/.bazelrc
+++ b/e2e/bzlmod_write_source_files_external/.bazelrc
@@ -1 +1,22 @@
+# Bazel settings that apply to this repository.
+# Settings that apply only to CI are in .aspect/bazelrc/ci.bazelrc
+
+# Import Aspect bazelrc presets
+import %workspace%/.aspect/bazelrc/convenience.bazelrc
+import %workspace%/.aspect/bazelrc/correctness.bazelrc
+import %workspace%/.aspect/bazelrc/performance.bazelrc
+import %workspace%/.aspect/bazelrc/debug.bazelrc
+import %workspace%/.aspect/bazelrc/javascript.bazelrc
+
+# Use a try-import for Bazel 6 settings since this repository is also tested against Bazel 5 on CI
+try-import %workspace%/.aspect/bazelrc/bazel6.bazelrc
+
+### PROJECT SPECIFIC OPTIONS ###
+
 common --enable_bzlmod
+
+# Load any settings & overrides specific to the current user from `.aspect/bazelrc/user.bazelrc`.
+# This file should appear in `.gitignore` so that settings are not shared with team members. This
+# should be last statement in this config so the user configuration is able to overwrite flags from
+# this file. See https://bazel.build/configure/best-practices#bazelrc-file.
+try-import %workspace%/.aspect/bazelrc/user.bazelrc
diff --git a/e2e/copy_to_directory/.aspect/bazelrc b/e2e/copy_to_directory/.aspect/bazelrc
deleted file mode 120000
index 2d2e61f06..000000000
--- a/e2e/copy_to_directory/.aspect/bazelrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../.aspect/bazelrc
\ No newline at end of file
diff --git a/e2e/copy_to_directory/.aspect/bazelrc/bazel6.bazelrc b/e2e/copy_to_directory/.aspect/bazelrc/bazel6.bazelrc
new file mode 120000
index 000000000..eed5e30c5
--- /dev/null
+++ b/e2e/copy_to_directory/.aspect/bazelrc/bazel6.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/bazel6.bazelrc
\ No newline at end of file
diff --git a/e2e/copy_to_directory/.aspect/bazelrc/convenience.bazelrc b/e2e/copy_to_directory/.aspect/bazelrc/convenience.bazelrc
new file mode 120000
index 000000000..524b51f4e
--- /dev/null
+++ b/e2e/copy_to_directory/.aspect/bazelrc/convenience.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/convenience.bazelrc
\ No newline at end of file
diff --git a/e2e/copy_to_directory/.aspect/bazelrc/correctness.bazelrc b/e2e/copy_to_directory/.aspect/bazelrc/correctness.bazelrc
new file mode 120000
index 000000000..f139b5d9f
--- /dev/null
+++ b/e2e/copy_to_directory/.aspect/bazelrc/correctness.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/correctness.bazelrc
\ No newline at end of file
diff --git a/e2e/copy_to_directory/.aspect/bazelrc/debug.bazelrc b/e2e/copy_to_directory/.aspect/bazelrc/debug.bazelrc
new file mode 120000
index 000000000..e9fb0cf99
--- /dev/null
+++ b/e2e/copy_to_directory/.aspect/bazelrc/debug.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/debug.bazelrc
\ No newline at end of file
diff --git a/e2e/copy_to_directory/.aspect/bazelrc/javascript.bazelrc b/e2e/copy_to_directory/.aspect/bazelrc/javascript.bazelrc
new file mode 120000
index 000000000..69810851d
--- /dev/null
+++ b/e2e/copy_to_directory/.aspect/bazelrc/javascript.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/javascript.bazelrc
\ No newline at end of file
diff --git a/e2e/copy_to_directory/.aspect/bazelrc/performance.bazelrc b/e2e/copy_to_directory/.aspect/bazelrc/performance.bazelrc
new file mode 120000
index 000000000..719484d5d
--- /dev/null
+++ b/e2e/copy_to_directory/.aspect/bazelrc/performance.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/performance.bazelrc
\ No newline at end of file
diff --git a/e2e/copy_to_directory/.bazelignore b/e2e/copy_to_directory/.bazelignore
deleted file mode 100644
index 9877b311d..000000000
--- a/e2e/copy_to_directory/.bazelignore
+++ /dev/null
@@ -1 +0,0 @@
-e2e/bzlmod/.aspect/bazelrc
diff --git a/e2e/copy_to_directory/.bazelrc b/e2e/copy_to_directory/.bazelrc
index e69de29bb..11c53fed7 100644
--- a/e2e/copy_to_directory/.bazelrc
+++ b/e2e/copy_to_directory/.bazelrc
@@ -0,0 +1,20 @@
+# Bazel settings that apply to this repository.
+# Settings that apply only to CI are in .aspect/bazelrc/ci.bazelrc
+
+# Import Aspect bazelrc presets
+import %workspace%/.aspect/bazelrc/convenience.bazelrc
+import %workspace%/.aspect/bazelrc/correctness.bazelrc
+import %workspace%/.aspect/bazelrc/performance.bazelrc
+import %workspace%/.aspect/bazelrc/debug.bazelrc
+import %workspace%/.aspect/bazelrc/javascript.bazelrc
+
+# Use a try-import for Bazel 6 settings since this repository is also tested against Bazel 5 on CI
+try-import %workspace%/.aspect/bazelrc/bazel6.bazelrc
+
+### PROJECT SPECIFIC OPTIONS ###
+
+# Load any settings & overrides specific to the current user from `.aspect/bazelrc/user.bazelrc`.
+# This file should appear in `.gitignore` so that settings are not shared with team members. This
+# should be last statement in this config so the user configuration is able to overwrite flags from
+# this file. See https://bazel.build/configure/best-practices#bazelrc-file.
+try-import %workspace%/.aspect/bazelrc/user.bazelrc
diff --git a/e2e/workspace/.aspect/bazelrc b/e2e/workspace/.aspect/bazelrc
deleted file mode 120000
index 2d2e61f06..000000000
--- a/e2e/workspace/.aspect/bazelrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../.aspect/bazelrc
\ No newline at end of file
diff --git a/e2e/workspace/.aspect/bazelrc/bazel6.bazelrc b/e2e/workspace/.aspect/bazelrc/bazel6.bazelrc
new file mode 120000
index 000000000..eed5e30c5
--- /dev/null
+++ b/e2e/workspace/.aspect/bazelrc/bazel6.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/bazel6.bazelrc
\ No newline at end of file
diff --git a/e2e/workspace/.aspect/bazelrc/convenience.bazelrc b/e2e/workspace/.aspect/bazelrc/convenience.bazelrc
new file mode 120000
index 000000000..524b51f4e
--- /dev/null
+++ b/e2e/workspace/.aspect/bazelrc/convenience.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/convenience.bazelrc
\ No newline at end of file
diff --git a/e2e/workspace/.aspect/bazelrc/correctness.bazelrc b/e2e/workspace/.aspect/bazelrc/correctness.bazelrc
new file mode 120000
index 000000000..f139b5d9f
--- /dev/null
+++ b/e2e/workspace/.aspect/bazelrc/correctness.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/correctness.bazelrc
\ No newline at end of file
diff --git a/e2e/workspace/.aspect/bazelrc/debug.bazelrc b/e2e/workspace/.aspect/bazelrc/debug.bazelrc
new file mode 120000
index 000000000..e9fb0cf99
--- /dev/null
+++ b/e2e/workspace/.aspect/bazelrc/debug.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/debug.bazelrc
\ No newline at end of file
diff --git a/e2e/workspace/.aspect/bazelrc/javascript.bazelrc b/e2e/workspace/.aspect/bazelrc/javascript.bazelrc
new file mode 120000
index 000000000..69810851d
--- /dev/null
+++ b/e2e/workspace/.aspect/bazelrc/javascript.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/javascript.bazelrc
\ No newline at end of file
diff --git a/e2e/workspace/.aspect/bazelrc/performance.bazelrc b/e2e/workspace/.aspect/bazelrc/performance.bazelrc
new file mode 120000
index 000000000..719484d5d
--- /dev/null
+++ b/e2e/workspace/.aspect/bazelrc/performance.bazelrc
@@ -0,0 +1 @@
+../../../../.aspect/bazelrc/performance.bazelrc
\ No newline at end of file
diff --git a/e2e/workspace/.bazelignore b/e2e/workspace/.bazelignore
deleted file mode 100644
index 9877b311d..000000000
--- a/e2e/workspace/.bazelignore
+++ /dev/null
@@ -1 +0,0 @@
-e2e/bzlmod/.aspect/bazelrc
diff --git a/e2e/workspace/.bazelrc b/e2e/workspace/.bazelrc
index e69de29bb..11c53fed7 100644
--- a/e2e/workspace/.bazelrc
+++ b/e2e/workspace/.bazelrc
@@ -0,0 +1,20 @@
+# Bazel settings that apply to this repository.
+# Settings that apply only to CI are in .aspect/bazelrc/ci.bazelrc
+
+# Import Aspect bazelrc presets
+import %workspace%/.aspect/bazelrc/convenience.bazelrc
+import %workspace%/.aspect/bazelrc/correctness.bazelrc
+import %workspace%/.aspect/bazelrc/performance.bazelrc
+import %workspace%/.aspect/bazelrc/debug.bazelrc
+import %workspace%/.aspect/bazelrc/javascript.bazelrc
+
+# Use a try-import for Bazel 6 settings since this repository is also tested against Bazel 5 on CI
+try-import %workspace%/.aspect/bazelrc/bazel6.bazelrc
+
+### PROJECT SPECIFIC OPTIONS ###
+
+# Load any settings & overrides specific to the current user from `.aspect/bazelrc/user.bazelrc`.
+# This file should appear in `.gitignore` so that settings are not shared with team members. This
+# should be last statement in this config so the user configuration is able to overwrite flags from
+# this file. See https://bazel.build/configure/best-practices#bazelrc-file.
+try-import %workspace%/.aspect/bazelrc/user.bazelrc