diff --git a/.github/workflows/build-win64.yml b/.github/workflows/build-win64.yml
index d79c205b9..10baaeb15 100644
--- a/.github/workflows/build-win64.yml
+++ b/.github/workflows/build-win64.yml
@@ -4,22 +4,21 @@ on: [pull_request, push]
 jobs:
   build:
     runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
           update: true
+          install: git
+      - run: git config --global core.autocrlf input
+      - uses: actions/checkout@v3
       - name: Build Dino
         run: |
-          ./build-win64.sh --prepare
-          ./build-win64.sh
+          msys2 -c 'build-win64.sh --prepare'
+          msys2 -c 'build-win64.sh'
       - name: Build Dino Installer
         run: |
-          ./build-win64.sh --build-installer
+          msys2 -c 'build-win64.sh --build-installer'
       - name: Get Dino Installer
         uses: actions/upload-artifact@v3
         with:
diff --git a/build-win64.sh b/build-win64.sh
index 1d3112c60..4143a154a 100644
--- a/build-win64.sh
+++ b/build-win64.sh
@@ -56,7 +56,6 @@ prepare()
        mingw64/mingw-w64-x86_64-gst-plugins-ugly \
        mingw64/mingw-w64-x86_64-nsis \
        mingw64/mingw-w64-x86_64-libsignal-protocol-c \
-       mingw64/mingw-w64-x86_64-ninja \
        mingw64/mingw-w64-x86_64-icu \
        mingw64/mingw-w64-x86_64-webrtc-audio-processing \
        git \