diff --git a/.bazelproject b/.bazelproject
index b0d95c736..297089176 100644
--- a/.bazelproject
+++ b/.bazelproject
@@ -3,11 +3,9 @@
 # See https://github.com/salesforce/bazel-eclipse/blob/main/docs/common/projectviews.md for VS Code
 # (with https://github.com/salesforce/bazel-vscode-java).
 
+# tools/eclipse/.managed-defaults.bazelproject has Eclipse (and thus VSC) specific settings which IntelliJ doesn't dig.
+
 directories:
   .
 
 derive_targets_from_directories: true
-
-# https://github.com/salesforce/bazel-eclipse/issues/475
-# https://github.com/salesforce/bazel-eclipse/blob/main/docs/common/projectviews.md#project-per-package
-target_provisioning_strategy: project-per-package
diff --git a/.bazelrc b/.bazelrc
index bfe00587b..5b78db38e 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -19,6 +19,7 @@ common --incompatible_strict_action_env
 # https://bazel.build/reference/command-line-reference#flag--test_output
 test --test_output=errors
 
+# https://github.com/salesforce/bazel-eclipse/blob/main/docs/common/classpath.md#basics-classpath
 # https://bazel.build/reference/command-line-reference#flag--explicit_java_test_deps
 # BOTH build and test HAVE to have this - otherwise it's broken due to frequent this:
 # "Build option --explicit_java_test_deps has changed, discarding analysis cache."
diff --git a/tools/eclipse/.managed-defaults.bazelproject b/tools/eclipse/.managed-defaults.bazelproject
new file mode 100644
index 000000000..16b45f3f7
--- /dev/null
+++ b/tools/eclipse/.managed-defaults.bazelproject
@@ -0,0 +1,6 @@
+# This extends //.bazelproject (which is primarily for IntelliJ) with required Bazel Eclipse settings.
+# https://github.com/salesforce/bazel-eclipse/blob/main/docs/common/projectviews.md
+
+# https://github.com/salesforce/bazel-eclipse/issues/475
+# https://github.com/salesforce/bazel-eclipse/blob/main/docs/common/projectviews.md#project-per-package
+target_provisioning_strategy: project-per-package