diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index b026cc21009..d587ba05d33 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -108,7 +108,6 @@ jobs:
         path: build/i2pd.exe
 
   build-xp:
-    if: false
     name: XP
     runs-on: windows-latest
 
@@ -129,8 +128,11 @@ jobs:
         cache: true
         update: true
 
-    - name: Clone MinGW packages repository
-      run: git clone https://github.com/msys2/MINGW-packages
+    - name: Clone MinGW packages repository and revert boost to 1.85.0
+      run: |
+        git clone https://github.com/msys2/MINGW-packages
+        cd MINGW-packages
+        git checkout 4cbb366edf2f268ac3146174b40ce38604646fc5 mingw-w64-boost
 
     # headers
     - name: Get headers package version
@@ -212,16 +214,17 @@ jobs:
       run: pacman --noconfirm -U MINGW-packages/mingw-w64-openssl/mingw-w64-i686-*-any.pkg.tar.zst
 
     # Boost
-    - name: Get boost package version
-      id:  version-boost
-      run: |
-        echo "version=$(pacman -Si mingw-w64-i686-boost | grep -Po '^Version\s*: \K.+')" >> $GITHUB_OUTPUT
+    #- name: Get boost package version
+    #  id:  version-boost
+    #  run: |
+    #    echo "version=$(pacman -Si mingw-w64-i686-boost | grep -Po '^Version\s*: \K.+')" >> $GITHUB_OUTPUT
     - name: Cache boost package
       uses: actions/cache@v4
       id: cache-boost
       with:
         path: MINGW-packages/mingw-w64-boost/*.zst
-        key: winxp-boost-${{ steps.version-boost.outputs.version }}
+        key: winxp-boost-1.85.0+crt-${{ steps.version-headers.outputs.version }}+ossl-${{ steps.version-openssl.outputs.version }}
+    # Rebuild package if packages above has changed
     - name: Build WinXP-capable boost package
       if: steps.cache-boost.outputs.cache-hit != 'true'
       run: |