diff --git a/.github/workflows/build-windows-cygwin.yml b/.github/workflows/build-windows-cygwin.yml
index 467d6778..dbb3f5de 100644
--- a/.github/workflows/build-windows-cygwin.yml
+++ b/.github/workflows/build-windows-cygwin.yml
@@ -21,6 +21,7 @@ jobs:
       - name: "Setup Cygwin"
         uses: cygwin/cygwin-install-action@v2
         with:
+          check-sig: false
           platform: x86_64
           packages: automake make cmake gcc-g++ doxygen graphviz libssl-devel libuuid-devel
 
diff --git a/.github/workflows/build-windows-msys2.yml b/.github/workflows/build-windows-msys2.yml
index 1d4970b1..99ca82ac 100644
--- a/.github/workflows/build-windows-msys2.yml
+++ b/.github/workflows/build-windows-msys2.yml
@@ -17,16 +17,17 @@ jobs:
       - name: "Setup MSYS2"
         uses: msys2/setup-msys2@v2
         with:
+          msystem: UCRT64
           release: false
           install: >-
             git
             make
-            python3-pip
-            mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-gcc
-            mingw-w64-x86_64-doxygen
-            mingw-w64-x86_64-graphviz
+            mingw-w64-ucrt-x86_64-cmake
+            mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-doxygen
+            mingw-w64-ucrt-x86_64-graphviz
             msys2-w32api-runtime
+            python-pip
 
       - name: "Setup cmake"
         run: cmake --version