diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3854852..85b925a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -112,7 +112,7 @@ jobs:
         run: |
           cd ..\
           git clone https://github.com/Microsoft/php-sdk-binary-tools.git php-sdk
-          .\php-sdk\phpsdk-vs16-x64.bat -t .\aws-crt-php\win_build.bat
+          .\php-sdk\phpsdk-vs16-x64.bat -t .\aws-crt-php\win_build.bat --task-args %CD%\aws-crt-php
 
 
   macos:
diff --git a/win_build.bat b/win_build.bat
index 3bd7660..22e5222 100644
--- a/win_build.bat
+++ b/win_build.bat
@@ -1,8 +1,7 @@
 @echo on
 
-echo %CD%
-
-set SOURCE_DIR=%CD%\aws-crt-php
+@REM Passing the source dirctory of aws-crt-php, if not passing the source directory, it will be pulled from github
+if not (%1)==() set SOURCE_DIR=%1
 
 call phpsdk_buildtree phpmaster
 
@@ -10,7 +9,7 @@ git clone https://github.com/php/php-src.git && cd php-src
 
 call phpsdk_deps --update --branch master
 
-robocopy %SOURCE_DIR% ..\pecl\awscrt /E
+if (%SOURCE_DIR%)==() (git clone --recursive https://github.com/awslabs/aws-crt-php.git ..\pecl\awscrt) else (robocopy %SOURCE_DIR% ..\pecl\awscrt /E)
 
 call buildconf
 
@@ -18,4 +17,4 @@ call configure --enable-cli --with-openssl --enable-awscrt=shared
 
 call nmake
 
-call nmake test-awscrt
\ No newline at end of file
+@REM call nmake test-awscrt