diff --git a/.github/workflows/ci-mingw64-Qt6.yml b/.github/workflows/ci-mingw64-Qt6.yml
index 946aa912e..6d11712b9 100644
--- a/.github/workflows/ci-mingw64-Qt6.yml
+++ b/.github/workflows/ci-mingw64-Qt6.yml
@@ -65,6 +65,11 @@ jobs:
           git submodule update --init --remote libbitdht/ libretroshare/ retroshare-webui/
           git submodule update --init supportlibs/librnp supportlibs/rapidjson supportlibs/restbed
 
+      - name: Workaround librnp strlen build regression
+        run: |
+          FILE="supportlibs/librnp/src/lib/crypto/mem.cpp"
+          grep -q '#include <cstring>' "$FILE" || sed -i '/#include <cstdio>/a #include <cstring>' "$FILE"
+
       - name: Build
         run: |
           qmake6 . -r -spec win32-g++ "CONFIG+=release" "CONFIG+=rs_autologin" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_sam3_libsam3"
diff --git a/.github/workflows/ci-mingw64.yml b/.github/workflows/ci-mingw64.yml
index c3b9d345c..d5f6da868 100644
--- a/.github/workflows/ci-mingw64.yml
+++ b/.github/workflows/ci-mingw64.yml
@@ -64,6 +64,11 @@ jobs:
           git submodule update --init --remote libbitdht/ libretroshare/ retroshare-webui/
           git submodule update --init supportlibs/librnp supportlibs/rapidjson supportlibs/restbed
 
+      - name: Workaround librnp strlen build regression
+        run: |
+          FILE="supportlibs/librnp/src/lib/crypto/mem.cpp"
+          grep -q '#include <cstring>' "$FILE" || sed -i '/#include <cstdio>/a #include <cstring>' "$FILE"
+
       - name: CI-Build
         run: |
           qmake-qt5.exe . -r -spec win32-g++ "CONFIG+=release" "CONFIG+=rs_autologin" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_sam3_libsam3"
diff --git a/.github/workflows/ci-ucrt64.yml b/.github/workflows/ci-ucrt64.yml
deleted file mode 100644
index 4e7323d03..000000000
--- a/.github/workflows/ci-ucrt64.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-name: UCRT64 Qt5 Build
-
-on:
-  push:
-    paths-ignore:
-    - '**/*.md'
-  pull_request:
-    paths-ignore:
-    - '**/*.md'
-
-concurrency:  
-  group: ${{ github.workflow}}-${{ github.head_ref }}  
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: windows-latest
-    permissions:
-      actions: write
-    defaults:
-      run:
-        shell: msys2 {0}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Setup MSYS2
-        uses: msys2/setup-msys2@40677d36a502eb2cf0fb808cc9dec31bf6152638 # v2.28.0
-        with:
-          msystem: UCRT64
-          update: true
-          install: >-
-            base-devel
-            git
-            wget
-            p7zip
-            gcc
-            perl
-            ruby
-            doxygen
-            cmake
-            mingw-w64-ucrt-x86_64-toolchain
-            mingw-w64-ucrt-x86_64-miniupnpc
-            mingw-w64-ucrt-x86_64-libxslt
-            mingw-w64-ucrt-x86_64-xapian-core
-            mingw-w64-ucrt-x86_64-sqlcipher
-            mingw-w64-ucrt-x86_64-qt5-base
-            mingw-w64-ucrt-x86_64-qt5-multimedia
-            mingw-w64-ucrt-x86_64-ccmake
-            mingw-w64-ucrt-x86_64-rapidjson
-            mingw-w64-ucrt-x86_64-json-c
-            mingw-w64-ucrt-x86_64-libbotan
-            mingw-w64-ucrt-x86_64-asio
-
-      - name: Checkout submodules
-        run: |
-          env
-          git submodule update --init --remote libbitdht/ libretroshare/ retroshare-webui/
-          git submodule update --init supportlibs/librnp supportlibs/rapidjson supportlibs/restbed
-
-      - name: CI-Build
-        run: |
-          qmake-qt5.exe . -r -spec win32-g++ "CONFIG+=release" "CONFIG+=rs_autologin" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_sam3_libsam3"
-          mingw32-make -j3