diff --git a/.github/workflows/build-and-make.yaml b/.github/workflows/build-and-make.yaml
index 6c61ead2c..acda077b8 100644
--- a/.github/workflows/build-and-make.yaml
+++ b/.github/workflows/build-and-make.yaml
@@ -110,11 +110,20 @@ jobs:
               uses: softprops/action-gh-release@v2
               with:
                   draft: true
-                  prerelease: false
+                  prerelease: ${{ github.event_name == 'pull_request' }}
                   name: Release v${{ steps.package-version.outputs.version }}
-                  tag_name: ${{ github.ref_name }}
+                  tag_name: ${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || format('test-{0}', github.sha) }}
                   generate_release_notes: true
                   files: |
-                      artifacts/**/*
+                      artifacts/macos-artifacts/*.dmg
+                      artifacts/macos-artifacts/*.zip
+                      artifacts/linux-artifacts/*.AppImage
+                      artifacts/linux-artifacts/*.deb
+                      artifacts/linux-artifacts/*.rpm
+                      artifacts/linux-artifacts/*.snap
+                      artifacts/linux-artifacts/*.tar.gz
+                      artifacts/windows-artifacts/*-setup.exe
+                      artifacts/windows-artifacts/*.msi
+                      artifacts/windows-artifacts/*.zip
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}