diff --git a/.github/workflows/base_tests.yml b/.github/workflows/base_tests.yml
index 47a9ee26e3..32c7115865 100644
--- a/.github/workflows/base_tests.yml
+++ b/.github/workflows/base_tests.yml
@@ -49,7 +49,7 @@ jobs:
             shell: bash
           - platform:
               os: windows
-            builder: windows-2022
+            builder: windows-latest
             shell: msys2 {0}
 
     defaults:
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
new file mode 100644
index 0000000000..75b37e7691
--- /dev/null
+++ b/.github/workflows/msys2.yml
@@ -0,0 +1,19 @@
+name: MSYS2
+on: [push, pull_request]
+
+jobs:
+  msys2-ucrt64:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v3
+      # - uses: msys2/setup-msys2@v2
+      #   with:
+      #     msystem: UCRT64
+      #     update: true
+      #     install: git mingw-w64-ucrt-x86_64-gcc
+      - name: CI-Build
+        run: |
+          echo 'Running in MSYS2!'