diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index dddd076025ba..8e0796b089f5 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -17,8 +17,9 @@ jobs:
       - X64
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
diff --git a/.github/workflows/engine-benchmark.yml b/.github/workflows/engine-benchmark.yml
index 14b36d0ac97f..798d142683b7 100644
--- a/.github/workflows/engine-benchmark.yml
+++ b/.github/workflows/engine-benchmark.yml
@@ -19,8 +19,9 @@ jobs:
       - benchmark
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
diff --git a/.github/workflows/engine-checks-nightly.yml b/.github/workflows/engine-checks-nightly.yml
index eca55cae3b25..e1d1748a8edf 100644
--- a/.github/workflows/engine-checks-nightly.yml
+++ b/.github/workflows/engine-checks-nightly.yml
@@ -20,8 +20,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -76,8 +77,9 @@ jobs:
       - ARM64
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -130,8 +132,9 @@ jobs:
       - macos-13
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -185,8 +188,9 @@ jobs:
       - Windows
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -240,8 +244,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -295,8 +300,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -362,8 +368,9 @@ jobs:
       - ARM64
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -427,8 +434,9 @@ jobs:
       - macos-13
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -493,8 +501,9 @@ jobs:
       - Windows
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -559,8 +568,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -625,8 +635,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -695,8 +706,9 @@ jobs:
       - ARM64
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -763,8 +775,9 @@ jobs:
       - macos-13
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -832,8 +845,9 @@ jobs:
       - Windows
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -901,8 +915,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
diff --git a/.github/workflows/engine-checks-optional.yml b/.github/workflows/engine-checks-optional.yml
index e6c5bd9d2232..dbc041db96fd 100644
--- a/.github/workflows/engine-checks-optional.yml
+++ b/.github/workflows/engine-checks-optional.yml
@@ -22,8 +22,9 @@ jobs:
     continue-on-error: true
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -77,8 +78,9 @@ jobs:
     continue-on-error: true
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -143,8 +145,9 @@ jobs:
     continue-on-error: true
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
diff --git a/.github/workflows/engine-checks.yml b/.github/workflows/engine-checks.yml
index 71e467027a71..27ff96f95f98 100644
--- a/.github/workflows/engine-checks.yml
+++ b/.github/workflows/engine-checks.yml
@@ -22,8 +22,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -77,8 +78,9 @@ jobs:
       - Windows
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -132,8 +134,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -198,8 +201,9 @@ jobs:
       - Windows
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -264,8 +268,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -333,8 +338,9 @@ jobs:
       - Windows
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -402,8 +408,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
diff --git a/.github/workflows/extra-nightly-tests.yml b/.github/workflows/extra-nightly-tests.yml
index 58bc60433cbb..ecf82618967d 100644
--- a/.github/workflows/extra-nightly-tests.yml
+++ b/.github/workflows/extra-nightly-tests.yml
@@ -19,8 +19,9 @@ jobs:
       - ubuntu-latest
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -96,8 +97,9 @@ jobs:
       - ubuntu-latest
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
diff --git a/.github/workflows/ide-packaging-optional.yml b/.github/workflows/ide-packaging-optional.yml
index 059d08a343f6..45068e02fd80 100644
--- a/.github/workflows/ide-packaging-optional.yml
+++ b/.github/workflows/ide-packaging-optional.yml
@@ -22,8 +22,9 @@ jobs:
     continue-on-error: true
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -75,8 +76,9 @@ jobs:
     continue-on-error: true
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -143,8 +145,9 @@ jobs:
     continue-on-error: true
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
diff --git a/.github/workflows/ide-packaging.yml b/.github/workflows/ide-packaging.yml
index 4ccb99f3ddbf..f9d321b20aa1 100644
--- a/.github/workflows/ide-packaging.yml
+++ b/.github/workflows/ide-packaging.yml
@@ -22,8 +22,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -75,8 +76,9 @@ jobs:
       - Windows
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -128,8 +130,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -194,8 +197,9 @@ jobs:
       - Windows
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -262,8 +266,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -347,8 +352,9 @@ jobs:
       - Windows
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml
index c881d4b07cbc..085443d1d43f 100644
--- a/.github/workflows/promote.yml
+++ b/.github/workflows/promote.yml
@@ -41,8 +41,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ea88fbe0c49f..ebb63f675203 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -37,8 +37,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -81,8 +82,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -144,8 +146,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -207,8 +210,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -262,8 +266,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -321,8 +326,9 @@ jobs:
       - ARM64
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -378,8 +384,9 @@ jobs:
       - macos-13
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -436,8 +443,9 @@ jobs:
       - Windows
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -499,8 +507,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -561,8 +570,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -634,8 +644,9 @@ jobs:
       - ARM64
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -712,8 +723,9 @@ jobs:
       - macos-13
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -791,8 +803,9 @@ jobs:
       - Windows
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
diff --git a/.github/workflows/std-libs-benchmark.yml b/.github/workflows/std-libs-benchmark.yml
index 3d44739ec2a7..8c19f9c720f1 100644
--- a/.github/workflows/std-libs-benchmark.yml
+++ b/.github/workflows/std-libs-benchmark.yml
@@ -19,8 +19,9 @@ jobs:
       - benchmark
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
diff --git a/.github/workflows/wasm-checks.yml b/.github/workflows/wasm-checks.yml
index 2d941f32eb3a..a56be1485710 100644
--- a/.github/workflows/wasm-checks.yml
+++ b/.github/workflows/wasm-checks.yml
@@ -22,8 +22,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -75,8 +76,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
@@ -128,8 +130,9 @@ jobs:
       - Linux
     steps:
       - if: runner.os == 'Windows'
-        name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
+        name: Add Git\bash.exe to PATH
+        run: set "PATH=C:\Program Files\Git\bin;%PATH%"
+        shell: cmd
       - name: Setup bazel environment
         uses: bazel-contrib/setup-bazel@09f3a72d13a081857b0ee94e986ffa84caef7c85
         with:
diff --git a/build_tools/build/src/ci_gen.rs b/build_tools/build/src/ci_gen.rs
index 7f4a14e51cf4..754f230fbf9d 100644
--- a/build_tools/build/src/ci_gen.rs
+++ b/build_tools/build/src/ci_gen.rs
@@ -18,7 +18,7 @@ use ide_ci::actions::workflow::definition::is_windows_runner;
 use ide_ci::actions::workflow::definition::run;
 use ide_ci::actions::workflow::definition::setup_artifact_api;
 use ide_ci::actions::workflow::definition::setup_bazel;
-use ide_ci::actions::workflow::definition::setup_msys;
+use ide_ci::actions::workflow::definition::setup_bin_bash;
 use ide_ci::actions::workflow::definition::setup_wasm_pack_step;
 use ide_ci::actions::workflow::definition::shell;
 use ide_ci::actions::workflow::definition::wrap_expression;
@@ -378,7 +378,7 @@ pub fn runs_on(os: OS, runner_type: RunnerType) -> Vec<RunnerLabel> {
 /// Initial CI job steps: check out the source code and set up the environment.
 pub fn setup_script_steps() -> Vec<Step> {
     let mut ret = vec![
-        setup_msys(),
+        setup_bin_bash(),
         setup_bazel(),
         setup_wasm_pack_step(),
         setup_artifact_api(),
diff --git a/build_tools/ci_utils/src/actions/workflow/definition.rs b/build_tools/ci_utils/src/actions/workflow/definition.rs
index a43532f418a3..05f4e140f7ee 100644
--- a/build_tools/ci_utils/src/actions/workflow/definition.rs
+++ b/build_tools/ci_utils/src/actions/workflow/definition.rs
@@ -78,11 +78,12 @@ pub fn is_github_hosted() -> String {
     "startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')".into()
 }
 
-pub fn setup_msys() -> Step {
+pub fn setup_bin_bash() -> Step {
     Step {
-        name: Some("Setup MSYS2".into()),
-        uses: Some("msys2/setup-msys2@v2".into()),
+        name: Some("Add Git\\bash.exe to PATH".into()),
         r#if: Some(is_windows_runner()),
+        shell: Some(Shell::Cmd),
+        run: Some(r#"set "PATH=C:\Program Files\Git\bin;%PATH%""#.into()),
         ..default()
     }
 }