diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c595e2..39b04b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -110,7 +110,9 @@ jobs:
           submodules: true
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
-          ./win_build.bat
+          git clone https://github.com/Microsoft/php-sdk-binary-tools.git php-sdk
+          (gc .\php-sdk\phpsdk-starter.bat) -replace 'cmd /k "!PHP_SDK_VC_SHELL_CMD! && ', 'call "' | Out-File -encoding ASCII .\php-sdk\phpsdk-starter.bat
+          .\win_build.bat
 
   # windows-vc14:
   #   runs-on: windows-latest
diff --git a/win_build.bat b/win_build.bat
index c0eb640..49bd706 100644
--- a/win_build.bat
+++ b/win_build.bat
@@ -1,6 +1,5 @@
 @echo on
 
-git clone https://github.com/Microsoft/php-sdk-binary-tools.git php-sdk
 cd ./php-sdk
 
 ./phpsdk-vs16-x64.bat