diff --git a/appveyor.yml b/appveyor.yml
index 9fb03c6..55abb99 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,10 +6,9 @@ before_build:
   - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh pacman
   - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh git
   - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade
+  - C:\msys64\usr\bin\bash -lc "C:/projects/jucipp/ci/update_ci.sh"
 
 build_script:    
-  - C:\msys64\usr\bin\bash -lc "script=compile CXX=clang++ CC=clang                   C:\projects\jucipp\ci\execute.sh"
-  - C:\msys64\usr\bin\bash -lc "script=clean                                          C:\projects\jucipp\ci\execute.sh"
-  - C:\msys64\usr\bin\bash -lc "script=compile                                        C:\projects\jucipp\ci\execute.sh"
-  - C:\msys64\usr\bin\bash -lc "script=static_analysis                                C:\projects\jucipp\ci\execute.sh"
-  - C:\msys64\usr\bin\bash -lc "script=compile make_command=\"broadwayd & make test\" C:\projects\jucipp\ci\execute.sh"
+  - C:\msys64\usr\bin\bash -lc "script=compile C:/projects/jucipp/ci/execute.sh"
+  - C:\msys64\usr\bin\bash -lc "broadwayd & exit"
+  - C:\msys64\usr\bin\bash -lc "script=compile make_command='make test' C:/projects/jucipp/ci/execute.sh"
diff --git a/ci/execute.sh b/ci/execute.sh
index 0cfdc76..4f60bf2 100755
--- a/ci/execute.sh
+++ b/ci/execute.sh
@@ -23,12 +23,13 @@ function osx () {
 }
 
 function windows () {
-  cd "$(dirname "$0")" || exit
+  export PATH="/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem:/c/WINDOWS/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl"
+  cd "C:/projects" || (echo "Error changing directory"; return 1)
   if [ "${script}" == "clean" ]; then
-    sudo rm ./build -rf
+    sudo rm "C:/projects/jucipp/build" -rf
     return 0
   fi
-  sh -c "./ci/${script}.sh"
+  sh -c "C:/projects/jucipp/ci/${script}.sh"
 }