diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 86cbc905f6f..cbd4a0802a5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -213,6 +213,19 @@ jobs:
       - name: Get Release Notes
         uses: ./.github/actions/get-release-notes
 
+      - name: Build x86 for client package in x64
+        id: build-x86
+        shell: cmd
+        if: ${{ matrix.platform == 'x64' }}
+        env:
+          PLATFORM: ${{ matrix.platform }}
+        run: |
+          echo arch_suffix=%PLATFORM%>> %GITHUB_OUTPUT%
+          mkdir builds\install_images
+          cd builds\docker\windows
+          call build.bat
+          call run.bat C:\fbscripts\build-x86.bat
+
       - name: Build
         id: build
         shell: cmd
@@ -257,8 +270,8 @@ jobs:
             Firebird-*-windows-${{ steps.build.outputs.arch_suffix }}*.exe
             Firebird-*-windows-${{ steps.build.outputs.arch_suffix }}*.zip
           uploadFiles: |
-            builds/install_images/Firebird-*-windows-*.exe
-            builds/install_images/Firebird-*-windows-*.zip
+            builds/install_images/Firebird-*-windows-${{ matrix.platform }}-*.exe
+            builds/install_images/Firebird-*-windows-${{ matrix.platform }}-*.zip
 
   build-macos:
     runs-on: macos-12
diff --git a/builds/docker/windows/Dockerfile b/builds/docker/windows/Dockerfile
index 8737e4edf95..8ef7be68db3 100644
--- a/builds/docker/windows/Dockerfile
+++ b/builds/docker/windows/Dockerfile
@@ -41,11 +41,13 @@ RUN `
     choco install --no-progress --yes git --version=2.33.1 && `
     choco install --no-progress --yes 7zip.install --version=19.0 && `
     choco install --no-progress --yes innosetup --version=6.1.2 && `
+    choco install --no-progress --yes wixtoolset --version=3.11.2 && `
     `
     refreshenv && `
     setx PATH "%PATH%;C:\Program Files\Git\usr\bin"
 
 ENV SEVENZIP='C:\Program Files\7-Zip'
 ENV INNO6_SETUP_PATH='C:\Program Files (x86)\Inno Setup 6'
+ENV WIX='C:\Program Files (x86)\WiX Toolset v3.11'
 
 COPY scripts\* C:\fbscripts\
diff --git a/builds/docker/windows/scripts/build-x86.bat b/builds/docker/windows/scripts/build-x86.bat
index 27237e00da2..3a7f546390c 100644
--- a/builds/docker/windows/scripts/build-x86.bat
+++ b/builds/docker/windows/scripts/build-x86.bat
@@ -12,3 +12,4 @@ call run_all.bat PDB
 call run_tests.bat
 
 copy C:\firebird-build\builds\install_images\* C:\firebird\builds\install_images
+xcopy /h /e /i /q C:\firebird-build\output_Win32_release C:\firebird\output_Win32_release