diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e52ca4a7ec..188d7eaa45 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,6 +29,7 @@ jobs:
 
   release_job:
     name: Create release
+    if: github.event_name == 'push'
     runs-on: ubuntu-latest
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
@@ -53,6 +54,7 @@ jobs:
 
   build_mingw_job:
     needs: release_job
+    if: ${{ needs.release_job.result != 'failure' }}
     strategy:
       fail-fast: false
       matrix:
@@ -81,6 +83,11 @@ jobs:
         asset_path: rtl_433-win-x64.zip
         asset_name: rtl_433-win-x64-${{ needs.release_job.outputs.release_version }}.zip
         asset_content_type: application/zip
+    - uses: actions/upload-artifact@v3
+      if: matrix.arch == 'x86-64' && github.event_name != 'push'
+      with:
+        name: rtl_433-win-x64.zip
+        path: rtl_433-win-x64.zip
     - uses: actions/upload-release-asset@v1
       if: matrix.arch == 'x86-64' && github.event_name == 'push'
       env:
@@ -90,9 +97,15 @@ jobs:
         asset_path: rtl_433-win-x32.zip
         asset_name: rtl_433-win-x32-${{ needs.release_job.outputs.release_version }}.zip
         asset_content_type: application/zip
+    - uses: actions/upload-artifact@v3
+      if: matrix.arch == 'x86-64' && github.event_name != 'push'
+      with:
+        name: rtl_433-win-x32.zip
+        path: rtl_433-win-x32.zip
 
   build_msvc_job:
     needs: [downloads_job, release_job]
+    if: ${{ needs.downloads_job.result != 'failure' && needs.release_job.result != 'failure'  }}
     strategy:
       fail-fast: false
       matrix:
@@ -192,6 +205,11 @@ jobs:
         asset_path: ${{ runner.workspace }}/rtl_433-win-msvc-x64.zip
         asset_name: rtl_433-win-msvc-x64-${{ needs.release_job.outputs.release_version }}.zip
         asset_content_type: application/zip
+    - uses: actions/upload-artifact@v3
+      if: matrix.os == 'windows-2019' && matrix.platform == 'x64' && github.event_name != 'push'
+      with:
+        name: rtl_433-win-msvc-x64.zip
+        path: ${{ runner.workspace }}/rtl_433-win-msvc-x64.zip
 
   build_linux_job:
     strategy: