diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5efb93f5..f06c0cb7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -111,14 +111,13 @@ jobs:
           arch: x64
           toolset: '14.43'
 
-      - name: Setup MYSYS2 (Windows)
+      - name: Setup MSYS2 (Windows)
         if: matrix.config.os == 'windows' && ( matrix.config.environment == 'mingw' || matrix.config.environment == 'ucrt' )
         uses: msys2/setup-msys2@v2
         with:
           msystem: ${{matrix.config.environment == 'mingw' && 'MINGW64' || 'UCRT64'}}
           update: true
           install: >-
-            mingw-w64-${{matrix.config.architecture}}-gcc
             mingw-w64-${{matrix.config.architecture}}-ninja
             mingw-w64-${{matrix.config.architecture}}-python
             mingw-w64-${{matrix.config.architecture}}-python-pip
@@ -131,6 +130,14 @@ jobs:
             mingw-w64-${{matrix.config.architecture}}-cmake
             git
 
+      - name: Setup GCC (MSYS2)
+        if: matrix.config.os == 'windows' && ( matrix.config.environment == 'mingw' || matrix.config.environment == 'ucrt' )
+        uses: Totto16/msys2-install-packages-pinned@v1
+        with:
+          msystem: ${{matrix.config.environment == 'mingw' && 'MINGW64' || 'UCRT64'}}
+          install: gcc=14 gcc-libs=!
+
+
       - name: Setup Clang (Linux) (libc++)
         if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib
         run: |
diff --git a/tools/options/meson.build b/tools/options/meson.build
index d2492e03..c3fbb5f0 100644
--- a/tools/options/meson.build
+++ b/tools/options/meson.build
@@ -82,13 +82,7 @@ if get_option('run_in_ci')
             'compilers': [msvc_compiler_current],
         },
         'msys2': {
-            # TODO: this needs to be 14, but we can't pin the package atm, see https://github.com/OpenBrickProtocolFoundation/oopetris/pull/224
-            'compilers': [
-                {
-                    'id': 'gcc',
-                    'checks': ['>=15', '<16'],
-                },
-            ],
+            'compilers': [gcc_14_compiler],
         },
         'linux': {
             'compilers': [clang_19_compiler, gcc_14_compiler],