diff --git a/.github/workflows/msys2-build.yml b/.github/workflows/msys2-build.yml
index d5d1361b7..70e556145 100644
--- a/.github/workflows/msys2-build.yml
+++ b/.github/workflows/msys2-build.yml
@@ -29,7 +29,7 @@ jobs:
 
     defaults:
       run:
-        shell: mingw64 {0}
+        shell: msys2 {0}
 
     steps:
     - uses: actions/checkout@v2
@@ -38,9 +38,13 @@ jobs:
     - uses: msys2/setup-msys2@v2
       with:
         msystem: ${{ matrix.msystem }}
-        install: git base-devel unzip p7zip mingw-w64-${{ matrix.arch }}-toolchain
+        install: base-devel git unzip p7zip mingw-w64-${{ matrix.arch }}-toolchain
+        location: D:\
         update: true
 
+    - name: Set mingw64 binaries in path
+      run: echo "${MINGW_PREFIX}/bin" >> $GITHUB_PATH
+
     # Force xmake to a specific folder (for cache)
     - name: Set xmake env
       run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV