diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cbd4a0802a..d9ff827780 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -217,10 +217,7 @@ jobs:
         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
@@ -232,7 +229,6 @@ jobs:
         env:
           PLATFORM: ${{ matrix.platform }}
         run: |
-          echo arch_suffix=%PLATFORM%>> %GITHUB_OUTPUT%
           mkdir builds\install_images
           cd builds\docker\windows
           call build.bat
@@ -267,11 +263,11 @@ jobs:
         with:
           token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }}
           deletePatterns:  |
-            Firebird-*-windows-${{ steps.build.outputs.arch_suffix }}*.exe
-            Firebird-*-windows-${{ steps.build.outputs.arch_suffix }}*.zip
+            Firebird-*-windows-${{ matrix.platform }}*.exe
+            Firebird-*-windows-${{ matrix.platform }}*.zip
           uploadFiles: |
-            builds/install_images/Firebird-*-windows-${{ matrix.platform }}-*.exe
-            builds/install_images/Firebird-*-windows-${{ matrix.platform }}-*.zip
+            builds/install_images/Firebird-*-windows-${{ matrix.platform }}*.exe
+            builds/install_images/Firebird-*-windows-${{ matrix.platform }}*.zip
 
   build-macos:
     runs-on: macos-12