diff --git a/.github/workflows/nightly-companion-windows.yml b/.github/workflows/nightly-companion-windows.yml
index f7c58d227..658d654ce 100644
--- a/.github/workflows/nightly-companion-windows.yml
+++ b/.github/workflows/nightly-companion-windows.yml
@@ -12,9 +12,9 @@ env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
   CMAKE_GENERATOR: "MSYS Makefiles"
-  QT_VERSION: "5.12.9"
-  MINGW_VERSION: "win64_mingw73"
-  MINGW_PATH: "mingw73_64"
+  QT_VERSION: "5.15.2"
+  MINGW_VERSION: "win32_mingw81"
+  MINGW_PATH: "mingw81_32"
 
 jobs:
   build:
@@ -30,47 +30,48 @@ jobs:
     steps:      
     - uses: msys2/setup-msys2@v2
       with:
-        msystem: MINGW64
+        msystem: MINGW32
         update: true
         install: git make
 
     - name: Install GCC 11.2
       run: | 
-        wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-11.2.0-10-any.pkg.tar.zst
-        wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-11.2.0-10-any.pkg.tar.zst
-        wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-crt-git-9.0.0.6448.b03cbfb95-1-any.pkg.tar.zst
-        pacman -U --noconfirm mingw-w64-x86_64-gcc-libs-11.2.0-10-any.pkg.tar.zst \
-                              mingw-w64-x86_64-gcc-11.2.0-10-any.pkg.tar.zst \
-                              mingw-w64-x86_64-crt-git-9.0.0.6448.b03cbfb95-1-any.pkg.tar.zst
+        wget https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libs-11.2.0-10-any.pkg.tar.zst
+        wget https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-11.2.0-10-any.pkg.tar.zst
+        wget https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-crt-git-9.0.0.6448.b03cbfb95-1-any.pkg.tar.zst
+        pacman -U --noconfirm mingw-w64-i686-gcc-libs-11.2.0-10-any.pkg.tar.zst \
+                              mingw-w64-i686-gcc-11.2.0-10-any.pkg.tar.zst \
+                              mingw-w64-i686-crt-git-9.0.0.6448.b03cbfb95-1-any.pkg.tar.zst
 
     - name: Install Dependencies
       run: |
-        pacman -S --noconfirm mingw-w64-x86_64-cmake \
-                              mingw-w64-x86_64-python-pip \
-                              mingw-w64-x86_64-python-pillow \
-                              mingw-w64-x86_64-python-lz4 \
-                              mingw-w64-x86_64-libjpeg-turbo \
-                              mingw-w64-x86_64-zlib \
-                              mingw-w64-x86_64-libtiff \
-                              mingw-w64-x86_64-freetype \
-                              mingw-w64-x86_64-lcms2 \
-                              mingw-w64-x86_64-libwebp \
-                              mingw-w64-x86_64-openjpeg2 \
-                              mingw-w64-x86_64-libimagequant \
-                              mingw-w64-x86_64-libraqm \
-                              mingw-w64-x86_64-SDL \
-                              mingw-w64-x86_64-clang \
-                              mingw-w64-x86_64-nsis
+        pacman -S --noconfirm mingw-w64-i686-cmake \
+                              mingw-w64-i686-python-pip \
+                              mingw-w64-i686-python-pillow \
+                              mingw-w64-i686-python-lz4 \
+                              mingw-w64-i686-libjpeg-turbo \
+                              mingw-w64-i686-zlib \
+                              mingw-w64-i686-libtiff \
+                              mingw-w64-i686-freetype \
+                              mingw-w64-i686-lcms2 \
+                              mingw-w64-i686-libwebp \
+                              mingw-w64-i686-openjpeg2 \
+                              mingw-w64-i686-libimagequant \
+                              mingw-w64-i686-libraqm \
+                              mingw-w64-i686-SDL \
+                              mingw-w64-i686-clang \
+                              mingw-w64-i686-openssl \
+                              mingw-w64-i686-nsis
         python -m pip install clang
 
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
         cache: true
-        cache-key-prefix: 'install-qt-action-win64'
+        cache-key-prefix: 'install-qt-action-win32'
         version: ${{ env.QT_VERSION }}
         arch: ${{ env.MINGW_VERSION }}
-        tools: 'tools_opensslv3_x64'
+        # tools: 'tools_opensslv3_x64'
 
     - name: Install ARM toolchain
       uses: fiam/arm-none-eabi-gcc@v1
@@ -92,6 +93,7 @@ jobs:
       run: |
         ls $RUNNER_WORKSPACE/Qt/Tools/ && \
         ls $RUNNER_WORKSPACE/Qt/Tools/OpenSSLv3/ && \
+        ls $RUNNER_WORKSPACE/Qt/Tools/OpenSSLv3/Win_x64 && \
         mkdir output && \
         CMAKE_PREFIX_PATH=$RUNNER_WORKSPACE/Qt/$QT_VERSION/$MINGW_PATH \
         QT_TOOLS_OPENSSL_ROOT_PATH=$RUNNER_WORKSPACE/Qt/Tools/OpenSSLv3/Win_x64 \