diff --git a/.github/workflows/demo-windows.yml b/.github/workflows/demo-windows.yml
index 8a70799c..e19140e7 100644
--- a/.github/workflows/demo-windows.yml
+++ b/.github/workflows/demo-windows.yml
@@ -9,33 +9,27 @@ jobs:
     runs-on: windows-2022
     steps:
       - name: Switch to msys2
-        run: echo "C:\msys64\usr\bin" >> $GITHUB_PATH
-        shell: bash
+        shell: powershell
+        run: echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - name: Install mysys2 dependencies
+        shell: powershell
         run: pacman -S --noconfirm unzip
-        shell: bash
+      - name: Show PATH
+        shell: powershell
+        run: Write-Host $env:path
       - uses: actions/checkout@v3
       - name: Setup
         uses: ./.github/actions/setup
         with:
           targets: x86_64-pc-windows-msvc
-      # Setup MSVC in the msys2 environment.
-      # Does roughly that: https://anadoxin.org/blog/bringing-visual-studio-compiler-into-msys2-environment.html/
-      - uses: ilammy/msvc-dev-cmd@v1
-      - name: Fix environment
-        shell: bash
-        run: rm "C:\\msys64\usr\bin\link.exe" # Rust seems to prefer the link.exe from msys2 instead of MSVC
-      - name: Show PATH
-        shell: bash
-        run: echo $PATH
       - name: Build
-        shell: bash
+        shell: powershell
         run: cargo build -p maplibre-demo --release --target x86_64-pc-windows-msvc
       - name: Check x86_64 windows
-        shell: bash
+        shell: powershell
         run: just check maplibre-demo x86_64-pc-windows-msvc
       - name: Test x86_64 windows
-        shell: bash
+        shell: powershell
         run: just test maplibre-demo x86_64-pc-windows-msvc
       - uses: actions/upload-artifact@v3
         with: