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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f02f6d2b..6c2bdb7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,13 +28,13 @@ include(SystemInformation)
 
 # External packages
 if(APPLE)
-  set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1")
+  set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@3")
 elseif(CYGWIN)
   set(OPENSSL_ROOT_DIR "/usr/lib")
   set(OPENSSL_INCLUDE_DIR "/usr/include")
   set(OPENSSL_CRYPTO_LIBRARY "/usr/lib/libcrypto.dll.a")
   set(OPENSSL_SSL_LIBRARY "/usr/lib/libssl.dll.a")
-elseif(MINGW)
+elseif(MINGW AND NOT MSYS)
   set(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/modules/OpenSSL/MinGW")
   set(OPENSSL_USE_STATIC_LIBS TRUE)
 elseif(MSVC)