diff --git a/.github/workflows/buildwheels.yml b/.github/workflows/buildwheels.yml
index 68169218..09fb4aa7 100644
--- a/.github/workflows/buildwheels.yml
+++ b/.github/workflows/buildwheels.yml
@@ -54,7 +54,7 @@ jobs:
         uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
-          update: false
+          update: true
           install: >-
             mingw-w64-x86_64-gcc-fortran
             mingw-w64-x86_64-ninja
@@ -365,10 +365,10 @@ jobs:
         uses: msys2/setup-msys2@v2
         with:
           msystem: UCRT64
-          update: false
+          update: true
           install: >-
-            mingw-w64-ucrt-x86_64-gcc
-            mingw-w64-ucrt-x86_64-ninja
+            mingw-w64-x86_64-gcc
+            mingw-w64-x86_64-ninja
             m4
 
       - if: matrix.os == 'windows-latest'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b15456c7..8012fe71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -581,9 +581,10 @@ if (APPLE)
 endif()
 if (WIN32)
   target_link_libraries(_PyPartMC PRIVATE -static gcc stdc++ winpthread quadmath -dynamic)
+  target_link_options(_PyPartMC PRIVATE -Wl,--whole-archive)
 endif()
 if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-  target_link_options(_PyPartMC PRIVATE -flto=auto)
+    target_link_options(_PyPartMC PRIVATE -flto=auto)
 endif()
 
 ### pedantics ######################################################################################