diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
index 0eb8d37aa..51a218b5d 100644
--- a/.github/workflows/Tasmota_build_master.yml
+++ b/.github/workflows/Tasmota_build_master.yml
@@ -137,10 +137,11 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           pattern: tasmota32*
-          path: ./firmware
-      - name: Display downloaded files
+          path: ./temp
+      - name: Move safeboot files
         run: |
-          ls -R ./firmware/
+          mkdir -p ./firmware/firmware
+          find ./temp -type f -exec cp -t ./firmware/firmware {} +
       - name: Add "release" to footer
         run: |
           sed -i -e "s/TASMOTA_SHA_SHORT/TASMOTA_SHA_SHORT release-/g" ./tasmota/include/tasmota_version.h
@@ -178,10 +179,11 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           pattern: tasmota32*
-          path: ./firmware
-      - name: Display downloaded files
+          path: ./temp
+      - name: Move safeboot files
         run: |
-          ls -R ./firmware/
+          mkdir -p ./firmware/firmware
+          find ./temp -type f -exec cp -t ./firmware/firmware {} +
       - name: Add "release" to footer
         run: |
           sed -i -e "s/TASMOTA_SHA_SHORT/TASMOTA_SHA_SHORT release-/g" ./tasmota/include/tasmota_version.h
@@ -199,28 +201,24 @@ jobs:
     continue-on-error: true
     steps:
     - uses: actions/checkout@v4
-    - name: Download Tasmota firmwares
+    - name: Download all Tasmota artifacts
       uses: actions/download-artifact@v4
       with:
         pattern: tasmota*
-        path: ./mv_firmware
-    - name: Download safeboot firmwares
-      uses: actions/download-artifact@v4
-      with:
-        pattern: tasmota32*
-        path: ./mv_firmware
+        path: ./temp
+    - name: Move files
+      run: |
+        mkdir -p ./release
+        find ./temp -type f -exec cp -t ./release {} +
     - name: Display structure of downloaded files
-      run: ls -R ./mv_firmware/
-    - name: Zip all map.gz files in one file -> map_all.zip
-      run: 7z a -mx=9 -tzip -xr'!.*' map_all.zip mv_firmware/map
+      run: ls -R ./release/
     - name: Release
       uses: jason2866/action-gh-release@v1.2
       #if: startsWith(github.ref, 'refs/tags/')
       with:
         tag_name: ${{ github.run_number }}
         files: |
-          ./mv_firmware/firmware/*
-          map_all.zip
+          ./release/tasmota*
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}