diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3eac895..e5abd12 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,9 +25,9 @@ jobs:
       run: mvn -B package --file com.eclipsesource.megit.parent/pom.xml
     - uses: actions/upload-artifact@v4
       with:
-        path: ./com.eclipsesource.megit.product/target/products/com.eclipsesource.megit-linux.gtk.x86_64.tar.gz
-        name: com.eclipsesource.megit-linux.gtk.x86_64.tar.gz
+        path: ./com.eclipsesource.megit.product/target/products/megit-*-linux.gtk.x86_64.tar.gz
+        name: megit-${{ github.run_id }}-linux.gtk.x86_64.tar.gz
     - uses: actions/upload-artifact@v4
       with:
-        path: ./com.eclipsesource.megit.product/target/products/com.eclipsesource.megit-win32.win32.x86_64.zip
-        name: com.eclipsesource.megit-win32.win32.x86_64.zip
+        path: ./com.eclipsesource.megit.product/target/products/megit-*-win32.win32.x86_64.zip
+        name: megit-${{ github.run_id }}-win32.win32.x86_64.zip
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 0e66b22..12257cc 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -24,4 +24,4 @@ jobs:
       uses: softprops/action-gh-release@v1
       with:
         draft: true
-        files: ./com.eclipsesource.megit.product/target/products/*.zip
+        files: ./com.eclipsesource.megit.product/target/products/*.(zip|gz)