diff --git a/base/src/com/google/idea/blaze/base/command/BlazeCommand.java b/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
index 5d7cf03d253..d2c0b68c9e8 100644
--- a/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
+++ b/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
@@ -21,6 +21,7 @@
 import com.google.idea.blaze.base.bazel.BuildSystem.BuildInvoker;
 import com.google.idea.blaze.base.model.primitives.TargetExpression;
 import com.google.idea.blaze.base.sync.aspects.strategy.AspectRepositoryProvider;
+import com.intellij.openapi.project.Project;
 
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -81,16 +82,16 @@ public String toString() {
     return Joiner.on(' ').join(toList());
   }
 
-  public static Builder builder(BuildInvoker invoker, BlazeCommandName name) {
-    return new Builder(invoker.getBinaryPath(), name);
+  public static Builder builder(BuildInvoker invoker, BlazeCommandName name, Project project) {
+    return new Builder(invoker.getBinaryPath(), name, project);
   }
 
   /**
    * @deprecated Use {@link #builder(BuildInvoker, BlazeCommandName)} instead.
    */
   @Deprecated
-  public static Builder builder(String binaryPath, BlazeCommandName name) {
-    return new Builder(binaryPath, name);
+  public static Builder builder(String binaryPath, BlazeCommandName name, Project project) {
+    return new Builder(binaryPath, name, project);
   }
 
   /** Builder for a blaze command */
@@ -104,14 +105,14 @@ public static class Builder {
     private final ImmutableList.Builder<String> blazeCmdlineFlags = ImmutableList.builder();
     private final ImmutableList.Builder<String> exeFlags = ImmutableList.builder();
 
-    public Builder(String binaryPath, BlazeCommandName name) {
+    public Builder(String binaryPath, BlazeCommandName name, Project project) {
       this.binaryPath = binaryPath;
       this.name = name;
       this.invokeParallel = false;
       // Tell forge what tool we used to call blaze so we can track usage.
       addBlazeFlags(BlazeFlags.getToolTagFlag());
 
-      AspectRepositoryProvider.getOverrideFlag().ifPresent(this::addBlazeFlags);
+      AspectRepositoryProvider.getOverrideFlag(project).ifPresent(this::addBlazeFlags);
     }
 
     private ImmutableList<String> getArguments() {
diff --git a/base/src/com/google/idea/blaze/base/command/info/BlazeInfoRunnerImpl.java b/base/src/com/google/idea/blaze/base/command/info/BlazeInfoRunnerImpl.java
index f87c9d6c1a3..ca112e5990a 100644
--- a/base/src/com/google/idea/blaze/base/command/info/BlazeInfoRunnerImpl.java
+++ b/base/src/com/google/idea/blaze/base/command/info/BlazeInfoRunnerImpl.java
@@ -42,7 +42,7 @@ public ListenableFuture<byte[]> runBlazeInfoGetBytes(
     return BlazeExecutor.getInstance()
         .submit(
             () -> {
-              BlazeCommand.Builder builder = BlazeCommand.builder(invoker, BlazeCommandName.INFO);
+              BlazeCommand.Builder builder = BlazeCommand.builder(invoker, BlazeCommandName.INFO, project);
               builder.addBlazeFlags(blazeFlags);
               if (keys != null) {
                 builder.addBlazeFlags(keys);
diff --git a/base/src/com/google/idea/blaze/base/command/mod/BlazeModRunnerImpl.java b/base/src/com/google/idea/blaze/base/command/mod/BlazeModRunnerImpl.java
index 433f0de51f8..d0dc59481ab 100644
--- a/base/src/com/google/idea/blaze/base/command/mod/BlazeModRunnerImpl.java
+++ b/base/src/com/google/idea/blaze/base/command/mod/BlazeModRunnerImpl.java
@@ -114,7 +114,7 @@ protected ListenableFuture<byte[]> runBlazeModGetBytes(
         .submit(
             () -> {
               BlazeCommand.Builder builder =
-                  BlazeCommand.builder(invoker, BlazeCommandName.MOD).addBlazeFlags(flags);
+                  BlazeCommand.builder(invoker, BlazeCommandName.MOD, project).addBlazeFlags(flags);
 
               if (args != null) {
                 builder.addBlazeFlags(args);
diff --git a/base/src/com/google/idea/blaze/base/dependencies/BlazeQueryDirectoryToTargetProvider.java b/base/src/com/google/idea/blaze/base/dependencies/BlazeQueryDirectoryToTargetProvider.java
index 3106f05e9a0..a6747546383 100644
--- a/base/src/com/google/idea/blaze/base/dependencies/BlazeQueryDirectoryToTargetProvider.java
+++ b/base/src/com/google/idea/blaze/base/dependencies/BlazeQueryDirectoryToTargetProvider.java
@@ -99,7 +99,7 @@ private static ImmutableList<TargetInfo> runQuery(
     BuildSystem buildSystem = Blaze.getBuildSystemProvider(project).getBuildSystem();
     BlazeCommand.Builder command =
         BlazeCommand.builder(
-                buildSystem.getDefaultInvoker(project, context), BlazeCommandName.QUERY)
+                buildSystem.getDefaultInvoker(project, context), BlazeCommandName.QUERY, project)
             .addBlazeFlags("--output=label_kind")
             .addBlazeFlags("--keep_going")
             .addBlazeFlags(query);
diff --git a/base/src/com/google/idea/blaze/base/dependencies/BlazeQuerySourceToTargetProvider.java b/base/src/com/google/idea/blaze/base/dependencies/BlazeQuerySourceToTargetProvider.java
index 32bf0d244ac..fc2ce7e232e 100644
--- a/base/src/com/google/idea/blaze/base/dependencies/BlazeQuerySourceToTargetProvider.java
+++ b/base/src/com/google/idea/blaze/base/dependencies/BlazeQuerySourceToTargetProvider.java
@@ -291,7 +291,7 @@ private static BlazeCommand.Builder getBlazeCommandBuilder(
             : BlazeQueryOutputBaseProvider.getInstance(project).getOutputBaseFlag();
     BuildInvoker buildInvoker =
         Blaze.getBuildSystemProvider(project).getBuildSystem().getDefaultInvoker(project, context);
-    return BlazeCommand.builder(buildInvoker, BlazeCommandName.QUERY)
+    return BlazeCommand.builder(buildInvoker, BlazeCommandName.QUERY, project)
         .addBlazeFlags(additionalBlazeFlags)
         .addBlazeFlags("--keep_going")
         .addBlazeFlags(query)
diff --git a/base/src/com/google/idea/blaze/base/qsync/BazelAppInspectorBuilder.java b/base/src/com/google/idea/blaze/base/qsync/BazelAppInspectorBuilder.java
index 578042c5bc5..76fb253f2b2 100644
--- a/base/src/com/google/idea/blaze/base/qsync/BazelAppInspectorBuilder.java
+++ b/base/src/com/google/idea/blaze/base/qsync/BazelAppInspectorBuilder.java
@@ -65,7 +65,7 @@ public AppInspectorInfo buildAppInspector(BlazeContext context, Set<Label> build
               BlazeInvocationContext.OTHER_CONTEXT);
 
       BlazeCommand.Builder builder =
-          BlazeCommand.builder(invoker, BlazeCommandName.BUILD)
+          BlazeCommand.builder(invoker, BlazeCommandName.BUILD, project)
               .addBlazeFlags(buildTargets.stream().map(Label::toString).collect(toImmutableList()))
               .addBlazeFlags(buildResultHelper.getBuildFlags())
               .addBlazeFlags(additionalBlazeFlags);
diff --git a/base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java b/base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java
index ee6e17e0373..e89dcc4b595 100644
--- a/base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java
+++ b/base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java
@@ -182,7 +182,7 @@ public OutputInfo build(
               BlazeInvocationContext.OTHER_CONTEXT);
 
       BlazeCommand.Builder builder =
-          BlazeCommand.builder(invoker, BlazeCommandName.BUILD)
+          BlazeCommand.builder(invoker, BlazeCommandName.BUILD, project)
               .addBlazeFlags(buildTargets.stream().map(Label::toString).collect(toImmutableList()))
               .addBlazeFlags(buildResultHelper.getBuildFlags())
               .addBlazeFlags(additionalBlazeFlags)
diff --git a/base/src/com/google/idea/blaze/base/qsync/BazelQueryRunner.java b/base/src/com/google/idea/blaze/base/qsync/BazelQueryRunner.java
index 20b9c79e0b0..80e98699385 100644
--- a/base/src/com/google/idea/blaze/base/qsync/BazelQueryRunner.java
+++ b/base/src/com/google/idea/blaze/base/qsync/BazelQueryRunner.java
@@ -69,7 +69,7 @@ public QuerySummary runQuery(QuerySpec query, BlazeContext context)
             "Running `%.200s` using invoker %s, runner %s",
             query, invoker.getClass().getSimpleName(), commandRunner.getClass().getSimpleName()));
 
-    BlazeCommand.Builder commandBuilder = BlazeCommand.builder(invoker, BlazeCommandName.QUERY);
+    BlazeCommand.Builder commandBuilder = BlazeCommand.builder(invoker, BlazeCommandName.QUERY, project);
     commandBuilder.addBlazeFlags(query.getQueryFlags());
     commandBuilder.addBlazeFlags("--keep_going");
     String queryExp = query.getQueryExpression();
diff --git a/base/src/com/google/idea/blaze/base/qsync/BazelRenderJarBuilder.java b/base/src/com/google/idea/blaze/base/qsync/BazelRenderJarBuilder.java
index 45a38ba01e6..dad25378f22 100644
--- a/base/src/com/google/idea/blaze/base/qsync/BazelRenderJarBuilder.java
+++ b/base/src/com/google/idea/blaze/base/qsync/BazelRenderJarBuilder.java
@@ -68,7 +68,7 @@ public RenderJarInfo buildRenderJar(BlazeContext context, Set<Label> buildTarget
 
       // TODO(b/283283123): Refactor render jar functionality to build_dependencies.bzl
       BlazeCommand.Builder builder =
-          BlazeCommand.builder(invoker, BlazeCommandName.BUILD)
+          BlazeCommand.builder(invoker, BlazeCommandName.BUILD, project)
               .addBlazeFlags(buildTargets.stream().map(Label::toString).collect(toImmutableList()))
               .addBlazeFlags(buildResultHelper.getBuildFlags())
               .addBlazeFlags(additionalBlazeFlags)
diff --git a/base/src/com/google/idea/blaze/base/qsync/CandidatePackageFinder.java b/base/src/com/google/idea/blaze/base/qsync/CandidatePackageFinder.java
index a93eb7004bd..331e149189f 100644
--- a/base/src/com/google/idea/blaze/base/qsync/CandidatePackageFinder.java
+++ b/base/src/com/google/idea/blaze/base/qsync/CandidatePackageFinder.java
@@ -103,7 +103,7 @@ public ImmutableList<CandidatePackage> getCandidatePackages(
 
   private ImmutableList<String> runQuery(Path path) throws BuildException {
     BlazeCommand.Builder command =
-        BlazeCommand.builder(buildInvoker, BlazeCommandName.QUERY)
+        BlazeCommand.builder(buildInvoker, BlazeCommandName.QUERY, ideProject)
             .addBlazeFlags("--output", "package")
             .addBlazeFlags("//" + path + "/...");
     try (BuildResultHelper helper = buildInvoker.createBuildResultHelper()) {
diff --git a/base/src/com/google/idea/blaze/base/run/BlazeBeforeRunCommandHelper.java b/base/src/com/google/idea/blaze/base/run/BlazeBeforeRunCommandHelper.java
index 9e314718688..c9a5822620e 100644
--- a/base/src/com/google/idea/blaze/base/run/BlazeBeforeRunCommandHelper.java
+++ b/base/src/com/google/idea/blaze/base/run/BlazeBeforeRunCommandHelper.java
@@ -135,7 +135,7 @@ project, new Task(project, TASK_TITLE, Task.Type.BEFORE_LAUNCH))
                 context.output(new StatusOutput(progressMessage));
 
                 BlazeCommand.Builder command =
-                    BlazeCommand.builder(binaryPath, commandName)
+                    BlazeCommand.builder(binaryPath, commandName, project)
                         .addTargets(targets)
                         .addBlazeFlags(overridableExtraBlazeFlags)
                         .addBlazeFlags(
diff --git a/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java b/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
index 779dd8050eb..9ad38716a19 100644
--- a/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
+++ b/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
@@ -413,7 +413,7 @@ private BlazeCommand.Builder getBlazeCommand(
         command = BlazeCommandName.COVERAGE;
       }
 
-      return BlazeCommand.builder(invoker, command)
+      return BlazeCommand.builder(invoker, command, project)
           .addTargets(configuration.getTargets())
           .addBlazeFlags(
               BlazeFlags.blazeFlags(
diff --git a/base/src/com/google/idea/blaze/base/sync/actions/CleanProjectTargetsSyncAction.java b/base/src/com/google/idea/blaze/base/sync/actions/CleanProjectTargetsSyncAction.java
index 9c9c159c105..4fe05947d1b 100644
--- a/base/src/com/google/idea/blaze/base/sync/actions/CleanProjectTargetsSyncAction.java
+++ b/base/src/com/google/idea/blaze/base/sync/actions/CleanProjectTargetsSyncAction.java
@@ -132,7 +132,7 @@ private static String getQuery(List<TargetIdeInfo> targets) {
   private static ImmutableList<TargetInfo> runBlazeQuery(
       Project project, String query, BlazeContext context) {
     BlazeCommand command =
-        BlazeCommand.builder(getBlazeBinaryPath(project), BlazeCommandName.QUERY)
+        BlazeCommand.builder(getBlazeBinaryPath(project), BlazeCommandName.QUERY, project)
             .addBlazeFlags("--output=label_kind")
             .addBlazeFlags("--keep_going")
             .addBlazeFlags(query)
diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java b/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
index 5882d4573a8..1ba3ab64fcc 100644
--- a/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
+++ b/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
@@ -752,7 +752,7 @@ private static BlazeBuildOutputs runBuildForTargets(
 
     Path targetPatternFile = prepareTargetPatternFile(project, targets);
     try (BuildResultHelper buildResultHelper = invoker.createBuildResultHelper()) {
-      BlazeCommand.Builder builder = BlazeCommand.builder(invoker, BlazeCommandName.BUILD);
+      BlazeCommand.Builder builder = BlazeCommand.builder(invoker, BlazeCommandName.BUILD, project);
       builder
           .setInvokeParallel(invokeParallel)
           .addBlazeFlags(BlazeFlags.TARGET_PATTERN_FILE, targetPatternFile.toString())
diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectRepositoryProvider.java b/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectRepositoryProvider.java
index 5fb443a4bb1..43a10ab3ec2 100644
--- a/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectRepositoryProvider.java
+++ b/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectRepositoryProvider.java
@@ -1,6 +1,8 @@
 package com.google.idea.blaze.base.sync.aspects.strategy;
 
 import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.openapi.project.Project;
+
 import java.io.File;
 import java.util.Optional;
 
@@ -10,17 +12,17 @@ public interface AspectRepositoryProvider {
 
   String OVERRIDE_REPOSITORY_FLAG = "--override_repository=intellij_aspect";
 
-  Optional<File> aspectDirectory();
+  Optional<File> aspectDirectory(Project project);
 
-  static Optional<File> findAspectDirectory() {
+  static Optional<File> findAspectDirectory(Project project) {
     return EP_NAME.getExtensionsIfPointIsRegistered().stream()
-        .map(AspectRepositoryProvider::aspectDirectory)
+        .map(aspectRepositoryProvider -> aspectRepositoryProvider.aspectDirectory(project))
         .filter(Optional::isPresent)
         .findFirst()
         .orElse(Optional.empty());
   }
 
-  static Optional<String> getOverrideFlag() {
-    return findAspectDirectory().map(it -> OVERRIDE_REPOSITORY_FLAG + "=" + it.getPath());
+  static Optional<String> getOverrideFlag(Project project) {
+    return findAspectDirectory(project).map(it -> OVERRIDE_REPOSITORY_FLAG + "=" + it.getPath());
   }
 }
diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectStrategyBazel.java b/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectStrategyBazel.java
index f5d78c8cea2..6fa0e8db356 100644
--- a/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectStrategyBazel.java
+++ b/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectStrategyBazel.java
@@ -20,6 +20,8 @@
 import com.google.idea.blaze.base.settings.BuildSystemName;
 import com.intellij.ide.plugins.PluginManager;
 import com.intellij.openapi.extensions.PluginDescriptor;
+import com.intellij.openapi.project.Project;
+
 import java.io.File;
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -41,7 +43,7 @@ public AspectStrategy getStrategy(BlazeVersionData versionData) {
 
   static final class RepositoryProvider implements AspectRepositoryProvider {
     @Override
-    public Optional<File> aspectDirectory() {
+    public Optional<File> aspectDirectory(Project project) {
       return Optional.ofNullable(PluginManager.getPluginByClass(AspectStrategy.class))
           .map((it) -> new File(it.getPath(), "aspect"));
     }
diff --git a/base/src/com/google/idea/blaze/base/sync/sharding/WildcardTargetExpander.java b/base/src/com/google/idea/blaze/base/sync/sharding/WildcardTargetExpander.java
index cac6ed9be41..3930753a409 100644
--- a/base/src/com/google/idea/blaze/base/sync/sharding/WildcardTargetExpander.java
+++ b/base/src/com/google/idea/blaze/base/sync/sharding/WildcardTargetExpander.java
@@ -214,7 +214,7 @@ private static ExpandedTargetsResult queryIndividualTargets(
       return new ExpandedTargetsResult(ImmutableList.of(), BuildResult.SUCCESS);
     }
     BlazeCommand.Builder builder =
-        BlazeCommand.builder(buildBinary, BlazeCommandName.QUERY)
+        BlazeCommand.builder(buildBinary, BlazeCommandName.QUERY, project)
             .addBlazeFlags(BlazeFlags.KEEP_GOING)
             .addBlazeFlags("--output=label_kind")
             .addBlazeFlags(query);
diff --git a/base/tests/unittests/com/google/idea/blaze/base/command/BlazeCommandTest.java b/base/tests/unittests/com/google/idea/blaze/base/command/BlazeCommandTest.java
index c74389fef26..2d39f2b0757 100644
--- a/base/tests/unittests/com/google/idea/blaze/base/command/BlazeCommandTest.java
+++ b/base/tests/unittests/com/google/idea/blaze/base/command/BlazeCommandTest.java
@@ -46,7 +46,7 @@ protected void initTest(
   @Test
   public void addedFlagsShouldGoAtStart() {
     List<String> flagsCommand =
-        BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.RUN)
+        BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.RUN, project)
             .addTargets(Label.create("//a:b"))
             .addBlazeFlags("--flag1", "--flag2")
             .addExeFlags("--exeFlag1", "--exeFlag2")
@@ -59,7 +59,7 @@ public void addedFlagsShouldGoAtStart() {
   @Test
   public void targetsShouldGoAfterBlazeFlagsAndDoubleHyphen() {
     List<String> command =
-        BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.RUN)
+        BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.RUN, project)
             .addTargets(Label.create("//a:b"), Label.create("//c:d"))
             .addBlazeFlags("--flag1", "--flag2")
             .addExeFlags("--exeFlag1", "--exeFlag2")
@@ -74,7 +74,7 @@ public void targetsShouldGoAfterBlazeFlagsAndDoubleHyphen() {
   @Test
   public void exeFlagsShouldGoLast() {
     List<String> command =
-        BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.RUN)
+        BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.RUN, project)
             .addTargets(Label.create("//a:b"), Label.create("//c:d"))
             .addBlazeFlags("--flag1", "--flag2")
             .addExeFlags("--exeFlag1", "--exeFlag2")
@@ -87,7 +87,7 @@ public void exeFlagsShouldGoLast() {
   @Test
   public void maintainUserOrderingOfTargets() {
     List<String> command =
-        BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.RUN)
+        BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.RUN, project)
             .addTargets(
                 Label.create("//a:b"),
                 TargetExpression.fromStringSafe("-//e:f"),
@@ -117,7 +117,7 @@ public void maintainUserOrderingOfTargets() {
   @Test
   public void binaryAndCommandShouldComeFirst() {
     List<String> command =
-        BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.BUILD)
+        BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.BUILD, project)
             .addBlazeFlags("--flag")
             .addExeFlags("--exeFlag")
             .build()
diff --git a/base/tests/unittests/com/google/idea/blaze/base/sync/aspects/strategy/AspectStrategyTest.java b/base/tests/unittests/com/google/idea/blaze/base/sync/aspects/strategy/AspectStrategyTest.java
index 815631d24cf..741e8b65b93 100644
--- a/base/tests/unittests/com/google/idea/blaze/base/sync/aspects/strategy/AspectStrategyTest.java
+++ b/base/tests/unittests/com/google/idea/blaze/base/sync/aspects/strategy/AspectStrategyTest.java
@@ -187,8 +187,8 @@ public void testDirectDepsExperimentRespected() {
         .containsExactly("intellij-info-generic", "intellij-info-java", "intellij-resolve-java");
   }
 
-  private static BlazeCommand.Builder emptyBuilder() {
-    return BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.BUILD);
+  private BlazeCommand.Builder emptyBuilder() {
+    return BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.BUILD, getProject());
   }
 
   private static ImmutableList<String> getBlazeFlags(BlazeCommand.Builder builder) {
diff --git a/clwb/src/com/google/idea/blaze/clwb/run/BlazeCidrLauncher.java b/clwb/src/com/google/idea/blaze/clwb/run/BlazeCidrLauncher.java
index 662c4db0cc5..f5f986a6932 100644
--- a/clwb/src/com/google/idea/blaze/clwb/run/BlazeCidrLauncher.java
+++ b/clwb/src/com/google/idea/blaze/clwb/run/BlazeCidrLauncher.java
@@ -163,7 +163,8 @@ private ProcessHandler createProcess(CommandLineState state, List<String> extraB
     BlazeCommand.Builder commandBuilder =
         BlazeCommand.builder(
                 Blaze.getBuildSystemProvider(project).getBinaryPath(project),
-                handlerState.getCommandState().getCommand())
+                handlerState.getCommandState().getCommand(),
+                project)
             .addTargets(configuration.getTargets())
             .addBlazeFlags(extraBlazeFlags)
             .addBlazeFlags(
diff --git a/clwb/tests/integrationtests/com/google/idea/blaze/clwb/base/TestAspectRepositoryProvider.java b/clwb/tests/integrationtests/com/google/idea/blaze/clwb/base/TestAspectRepositoryProvider.java
index a7b97322c19..e42763e8fb8 100644
--- a/clwb/tests/integrationtests/com/google/idea/blaze/clwb/base/TestAspectRepositoryProvider.java
+++ b/clwb/tests/integrationtests/com/google/idea/blaze/clwb/base/TestAspectRepositoryProvider.java
@@ -2,6 +2,8 @@
 
 import com.google.idea.blaze.base.sync.aspects.strategy.AspectRepositoryProvider;
 import com.google.idea.testing.runfiles.Runfiles;
+import com.intellij.openapi.project.Project;
+
 import java.io.File;
 import java.nio.file.Path;
 import java.util.Optional;
@@ -9,7 +11,7 @@
 public class TestAspectRepositoryProvider implements AspectRepositoryProvider {
 
   @Override
-  public Optional<File> aspectDirectory() {
+  public Optional<File> aspectDirectory(Project project) {
     return Optional.of(Runfiles.runfilesPath("aspect")).map(Path::toFile);
   }
 }
diff --git a/cpp/src/com/google/idea/blaze/cpp/XcodeCompilerSettingsProviderImpl.java b/cpp/src/com/google/idea/blaze/cpp/XcodeCompilerSettingsProviderImpl.java
index 5675975c0e5..0569556e1be 100644
--- a/cpp/src/com/google/idea/blaze/cpp/XcodeCompilerSettingsProviderImpl.java
+++ b/cpp/src/com/google/idea/blaze/cpp/XcodeCompilerSettingsProviderImpl.java
@@ -83,7 +83,7 @@ public Optional<XcodeCompilerSettings> fromContext(BlazeContext context, Project
         }
         String xcodeVersion = versions.xcodeVersion.get();
         String developerDir = XcodeCompilerSettingsProviderImpl.queryDeveloperDir(context, invoker,
-            workspaceRoot, xcodeVersion);
+            workspaceRoot, xcodeVersion, project);
         String sdkVersionString = String.format("MacOSX%s.sdk", macosSdkVersion);
         settings = Optional.of(XcodeCompilerSettings.create(
             Path.of(developerDir),
@@ -160,8 +160,8 @@ public boolean processLine(String line) {
    * https://github.com/bazelbuild/bazel/blob/1811e82ca4e68c2dd52eed7907c3d1926237e18a/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java#L241
    */
   private static String queryDeveloperDir(BlazeContext context, BuildInvoker invoker,
-      WorkspaceRoot workspaceRoot, String xcodeVersion) throws XcodeCompilerSettingsException {
-    BlazeCommand.Builder runXcodeLocator = BlazeCommand.builder(invoker, BlazeCommandName.RUN);
+                                          WorkspaceRoot workspaceRoot, String xcodeVersion, Project project) throws XcodeCompilerSettingsException {
+    BlazeCommand.Builder runXcodeLocator = BlazeCommand.builder(invoker, BlazeCommandName.RUN, project);
     runXcodeLocator.addTargets(
         Label.fromStringSafe("@bazel_tools//tools/osx:xcode-locator"));
     runXcodeLocator.addExeFlags(xcodeVersion).build();
diff --git a/gazelle/src/com/google/idea/blaze/gazelle/GazelleRunner.java b/gazelle/src/com/google/idea/blaze/gazelle/GazelleRunner.java
index cf4a2c25d1f..ef1fe99f299 100644
--- a/gazelle/src/com/google/idea/blaze/gazelle/GazelleRunner.java
+++ b/gazelle/src/com/google/idea/blaze/gazelle/GazelleRunner.java
@@ -25,6 +25,7 @@
 import com.google.idea.blaze.base.model.primitives.WorkspaceRoot;
 import com.google.idea.blaze.base.scope.BlazeContext;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.project.Project;
 
 import java.util.Collection;
 import java.util.List;
@@ -45,10 +46,11 @@ protected static BlazeCommand createGazelleRunCommand(
             BuildInvoker invoker,
             List<String> blazeFlags,
             Label gazelleTarget,
-            Collection<WorkspacePath> directories
+            Collection<WorkspacePath> directories,
+            Project project
     ) {
         BlazeCommand.Builder builder = BlazeCommand.builder(invoker,
-                BlazeCommandName.RUN);
+                BlazeCommandName.RUN, project);
         builder.addBlazeFlags(blazeFlags);
         builder.addTargets(gazelleTarget);
         List<String> directoriesToRegenerate =
@@ -72,5 +74,6 @@ public abstract GazelleRunResult runBlazeGazelle(
             List<String> blazeFlags,
             Label gazelleTarget,
             Collection<WorkspacePath> directories,
-            ImmutableList<Parser> issueParsers);
+            ImmutableList<Parser> issueParsers,
+            Project project);
 }
diff --git a/gazelle/src/com/google/idea/blaze/gazelle/GazelleRunnerImpl.java b/gazelle/src/com/google/idea/blaze/gazelle/GazelleRunnerImpl.java
index 72e330deb08..2d4fe8fabf1 100644
--- a/gazelle/src/com/google/idea/blaze/gazelle/GazelleRunnerImpl.java
+++ b/gazelle/src/com/google/idea/blaze/gazelle/GazelleRunnerImpl.java
@@ -27,6 +27,8 @@
 import com.google.idea.blaze.base.model.primitives.WorkspacePath;
 import com.google.idea.blaze.base.model.primitives.WorkspaceRoot;
 import com.google.idea.blaze.base.scope.BlazeContext;
+import com.intellij.openapi.project.Project;
+
 import java.io.ByteArrayOutputStream;
 import java.util.Collection;
 import java.util.List;
@@ -42,9 +44,10 @@ public GazelleRunResult runBlazeGazelle(
       List<String> blazeFlags,
       Label gazelleTarget,
       Collection<WorkspacePath> directories,
-      ImmutableList<Parser> issueParsers) {
+      ImmutableList<Parser> issueParsers,
+      Project project) {
     BlazeCommand command = GazelleRunner.createGazelleRunCommand(invoker,
-            blazeFlags, gazelleTarget, directories);
+            blazeFlags, gazelleTarget, directories, project);
     ByteArrayOutputStream stdout = new ByteArrayOutputStream();
     int exitCode =
         ExternalTask.builder(workspaceRoot)
diff --git a/gazelle/src/com/google/idea/blaze/gazelle/GazelleSyncListener.java b/gazelle/src/com/google/idea/blaze/gazelle/GazelleSyncListener.java
index 7241ad180f6..eda266ba9dc 100644
--- a/gazelle/src/com/google/idea/blaze/gazelle/GazelleSyncListener.java
+++ b/gazelle/src/com/google/idea/blaze/gazelle/GazelleSyncListener.java
@@ -89,7 +89,8 @@ private GazelleRunResult doRunGazelle(
             blazeFlags,
             gazelleBinary,
             importantDirectories,
-            issueParsers);
+            issueParsers,
+            project);
   }
 
   private ImmutableList<BlazeIssueParser.Parser> gazelleIssueParsers(
diff --git a/gazelle/tests/integrationtests/com/google/idea/blaze/gazelle/sync/RunGazelleOnSyncTest.java b/gazelle/tests/integrationtests/com/google/idea/blaze/gazelle/sync/RunGazelleOnSyncTest.java
index 38db6e01c24..a9bc9d8d467 100644
--- a/gazelle/tests/integrationtests/com/google/idea/blaze/gazelle/sync/RunGazelleOnSyncTest.java
+++ b/gazelle/tests/integrationtests/com/google/idea/blaze/gazelle/sync/RunGazelleOnSyncTest.java
@@ -29,6 +29,7 @@
 import com.google.idea.blaze.gazelle.GazelleRunResult;
 import com.google.idea.blaze.gazelle.GazelleRunner;
 import com.google.idea.blaze.gazelle.GazelleUserSettings;
+import com.intellij.openapi.project.Project;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -146,12 +147,13 @@ public GazelleRunResult runBlazeGazelle(BlazeContext context,
                                                 List<String> blazeFlags,
                                                 Label gazelleTarget,
                                                 Collection<WorkspacePath> directories,
-                                                ImmutableList<BlazeIssueParser.Parser> issueParsers) {
+                                                ImmutableList<BlazeIssueParser.Parser> issueParsers,
+                                                Project project) {
             // For now, we can't run bazel on tests, since some of these tests
             // might be run remotely. Therefore, we just check that the Bazel
             // command that would have been run has the right shape.
             command = GazelleRunner.createGazelleRunCommand(invoker, blazeFlags,
-                    gazelleTarget, directories);
+                    gazelleTarget, directories, project);
             return GazelleRunResult.SUCCESS;
         }
     }
diff --git a/java/src/com/google/idea/blaze/java/fastbuild/FastBuildServiceImpl.java b/java/src/com/google/idea/blaze/java/fastbuild/FastBuildServiceImpl.java
index 6460b01c9f5..d2b4a993f9e 100644
--- a/java/src/com/google/idea/blaze/java/fastbuild/FastBuildServiceImpl.java
+++ b/java/src/com/google/idea/blaze/java/fastbuild/FastBuildServiceImpl.java
@@ -289,7 +289,7 @@ private FastBuildState.BuildOutput buildDeployJar(
     Stopwatch timer = Stopwatch.createStarted();
 
     BlazeCommand.Builder command =
-        BlazeCommand.builder(buildParameters.blazeBinary(), BlazeCommandName.BUILD)
+        BlazeCommand.builder(buildParameters.blazeBinary(), BlazeCommandName.BUILD, project)
             .addTargets(deployJarStrategy.getBuildTargets(label, blazeVersionData))
             .addBlazeFlags(deployJarStrategy.getBuildFlags(blazeVersionData))
             .addBlazeFlags(buildParameters.buildFlags())
diff --git a/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java b/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java
index e0315c31cc0..7ced8164183 100644
--- a/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java
+++ b/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java
@@ -247,7 +247,7 @@ static BlazeCommand.Builder getBlazeCommandBuilder(
       blazeCommand = BlazeCommandName.COVERAGE;
     }
     BlazeCommand.Builder command =
-        BlazeCommand.builder(binaryPath, blazeCommand)
+        BlazeCommand.builder(binaryPath, blazeCommand, project)
             .addTargets(configuration.getTargets())
             .addBlazeFlags(
                 BlazeFlags.blazeFlags(
diff --git a/java/tests/unittests/com/google/idea/blaze/java/run/BlazeJavaRunProfileStateTest.java b/java/tests/unittests/com/google/idea/blaze/java/run/BlazeJavaRunProfileStateTest.java
index b4f445dde33..2ff926dd5c9 100644
--- a/java/tests/unittests/com/google/idea/blaze/java/run/BlazeJavaRunProfileStateTest.java
+++ b/java/tests/unittests/com/google/idea/blaze/java/run/BlazeJavaRunProfileStateTest.java
@@ -313,7 +313,7 @@ public void kotlinxCoroutinesJavaAgentShouldBeAddedAsJavaAgent() {
   @Test
   public void getBashCommandsToRunScript() throws Exception {
     BlazeCommand.Builder commandBuilder =
-        BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.BUILD)
+        BlazeCommand.builder("/usr/bin/blaze", BlazeCommandName.BUILD, getProject())
             .addTargets(Label.create("//label:java_binary_rule"));
     List<String> command =
         HotSwapCommandBuilder.getBashCommandsToRunScript(getProject(), commandBuilder);
diff --git a/javascript/src/com/google/idea/blaze/typescript/BlazeTypescriptSyncPlugin.java b/javascript/src/com/google/idea/blaze/typescript/BlazeTypescriptSyncPlugin.java
index 0626cc7bee2..33349a48b58 100644
--- a/javascript/src/com/google/idea/blaze/typescript/BlazeTypescriptSyncPlugin.java
+++ b/javascript/src/com/google/idea/blaze/typescript/BlazeTypescriptSyncPlugin.java
@@ -194,7 +194,7 @@ private static int syncTsConfigTarget(
       commandName = BlazeCommandName.RUN;
     }
     BlazeCommand command =
-        BlazeCommand.builder(binaryPath, commandName)
+        BlazeCommand.builder(binaryPath, commandName, project)
             .addTargets(target)
             .addBlazeFlags(
                 BlazeFlags.blazeFlags(
diff --git a/plugin_dev/src/com/google/idea/blaze/plugin/run/BuildPluginBeforeRunTaskProvider.java b/plugin_dev/src/com/google/idea/blaze/plugin/run/BuildPluginBeforeRunTaskProvider.java
index e6b713e219a..d6cc157c718 100644
--- a/plugin_dev/src/com/google/idea/blaze/plugin/run/BuildPluginBeforeRunTaskProvider.java
+++ b/plugin_dev/src/com/google/idea/blaze/plugin/run/BuildPluginBeforeRunTaskProvider.java
@@ -204,7 +204,7 @@ protected Void execute(BlazeContext context) {
                           .getBuildInvoker(project, context);
                   try (BuildResultHelper buildResultHelper = invoker.createBuildResultHelper()) {
                     BlazeCommand.Builder command =
-                        BlazeCommand.builder(invoker, BlazeCommandName.BUILD)
+                        BlazeCommand.builder(invoker, BlazeCommandName.BUILD, project)
                             .addTargets(config.getTargets())
                             .addBlazeFlags(
                                 BlazeFlags.blazeFlags(
diff --git a/scala/src/com/google/idea/blaze/scala/run/producers/GenerateDeployableJarTaskProvider.java b/scala/src/com/google/idea/blaze/scala/run/producers/GenerateDeployableJarTaskProvider.java
index 61eea6a103a..92574a0964f 100644
--- a/scala/src/com/google/idea/blaze/scala/run/producers/GenerateDeployableJarTaskProvider.java
+++ b/scala/src/com/google/idea/blaze/scala/run/producers/GenerateDeployableJarTaskProvider.java
@@ -243,7 +243,7 @@ protected BuildResult execute(BlazeContext context) {
 
                 context.output(new StatusOutput(title));
                 BlazeCommand command =
-                    BlazeCommand.builder(binaryPath, BlazeCommandName.BUILD)
+                    BlazeCommand.builder(binaryPath, BlazeCommandName.BUILD, project)
                         .addTargets(target.withTargetName(target.targetName() + "_deploy.jar"))
                         .addBlazeFlags(
                             BlazeFlags.blazeFlags(