diff --git a/.github/workflows/build-be.yml b/.github/workflows/build-be.yml
index 6425a73..5a0c952 100644
--- a/.github/workflows/build-be.yml
+++ b/.github/workflows/build-be.yml
@@ -160,15 +160,13 @@ jobs:
           echo "doorstop_version=$VERSION" >> $GITHUB_ENV
       - name: Create zips
         run: |
+          mkdir dist
           cd artifacts
-          (cd doorstop_win_release; zip -r ../doorstop_win_release_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_win_verbose; zip -r ../doorstop_win_verbose_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_linux_release; zip -r ../doorstop_linux_release_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_linux_verbose; zip -r ../doorstop_linux_verbose_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_linux_debug; zip -r ../doorstop_linux_debug_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_macos_release; zip -r ../doorstop_macos_release_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_macos_verbose; zip -r ../doorstop_macos_verbose_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_macos_debug; zip -r ../doorstop_macos_debug_${{ env.doorstop_version }}.zip *)
+          zip -r ../dist/doorstop_all_${{ env.doorstop_version }}.zip *
+          for dir in *
+          do
+            (cd ${dir}; zip -r ../../dist/${dir}_${{ env.doorstop_version }}.zip *)
+          done
       - name: Create release
         uses: marvinpinto/action-automatic-releases@latest
         with:
@@ -176,12 +174,4 @@ jobs:
           automatic_release_tag: "ci"
           prerelease: true
           title: "CI build"
-          files: |
-            artifacts/doorstop_win_release_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_win_verbose_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_linux_release_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_linux_verbose_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_linux_debug_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_macos_release_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_macos_verbose_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_macos_debug_${{ env.doorstop_version }}.zip
+          files: dist/*.zip