diff --git a/Tools/ci/setenv.ps1 b/Tools/ci/setenv.ps1
index 9113108898..5e50e39b86 100644
--- a/Tools/ci/setenv.ps1
+++ b/Tools/ci/setenv.ps1
@@ -26,9 +26,14 @@ if (Test-Path "$env:PICO_TOOLCHAIN_PATH" ) {
 if ($IsWindows) {
     $env:PATH = "C:\MinGW\msys\1.0\bin;C:\MinGW\bin;$env:PATH"
 
-    $env:PATH = "C:\Python39;C:\Python39\Scripts;$env:PATH"
-    $env:PYTHON = "C:\Python39\python"
-    $env:ESP32_PYTHON_PATH = "C:\Python39"
+    $env:PYTHON_PATH = "C:\Python39-x64"
+    if ( -not (Test-Path "$env:PYTHON_PATH") ) {
+        $env:PYTHON_PATH = "C:\Python39"
+    }
+
+    $env:PATH = "$env:PYTHON_PATH;$env:PYTHON_PATH\Scripts;$env:PATH"
+    $env:PYTHON = "$env:PYTHON_PATH\python"
+    $env:ESP32_PYTHON_PATH = "$env:PYTHON_PATH"
 
     $env:PATH = "$env:PROGRAMFILES\CMake\bin;$env:PATH"