diff --git a/scripts/all-dependencies.ps1 b/scripts/all-dependencies.ps1
index 2cbf88739e..23838d1a99 100755
--- a/scripts/all-dependencies.ps1
+++ b/scripts/all-dependencies.ps1
@@ -3,13 +3,14 @@ param(
 )
 
 $ErrorActionPreference = 'Stop'
+. (Join-Path $PSScriptRoot "env.ps1")
+
+if ($env:CI) {
+  & (Join-Path $PSScriptRoot "update-submodules.ps1")
+}
 
 $DidAnything = $false;
 
-$BUN_BASE_DIR = if ($env:BUN_BASE_DIR) { $env:BUN_BASE_DIR } else { Join-Path $PSScriptRoot '..' }
-$BUN_DEPS_DIR = if ($env:BUN_DEPS_DIR) { $env:BUN_DEPS_DIR } else { Join-Path $BUN_BASE_DIR 'src\deps' }
-$BUN_DEPS_OUT_DIR = if ($env:BUN_DEPS_OUT_DIR) { $env:BUN_DEPS_OUT_DIR } else { Join-Path $BUN_BASE_DIR 'build\bun-deps' }
-
 function Build-Dependency {
   param(
     $Script,
diff --git a/scripts/env.ps1 b/scripts/env.ps1
index c1ffe28f1e..3c9c97acb4 100755
--- a/scripts/env.ps1
+++ b/scripts/env.ps1
@@ -45,7 +45,7 @@ $ENV:BUN_DEV_ENV_SET = "Baseline=$Baseline";
 
 $BUN_BASE_DIR = if ($env:BUN_BASE_DIR) { $env:BUN_BASE_DIR } else { Join-Path $ScriptDir '..' }
 $BUN_DEPS_DIR = if ($env:BUN_DEPS_DIR) { $env:BUN_DEPS_DIR } else { Join-Path $BUN_BASE_DIR 'src\deps' }
-$BUN_DEPS_OUT_DIR = if ($env:BUN_DEPS_OUT_DIR) { $env:BUN_DEPS_OUT_DIR } else { Join-Path $BUN_BASE_DIR 'build\deps' }
+$BUN_DEPS_OUT_DIR = if ($env:BUN_DEPS_OUT_DIR) { $env:BUN_DEPS_OUT_DIR } else { Join-Path $BUN_BASE_DIR 'build\bun-deps' }
 
 $CPUS = if ($env:CPUS) { $env:CPUS } else { (Get-CimInstance -Class Win32_Processor).NumberOfCores }