diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 9c607318..e19de538 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -32,12 +32,15 @@ jobs:
           path: novelwriter/assets
 
       - name: Build AppImage
-        run: python pkgutils.py build-appimage --linux-tag $LINUX_TAG --python-version $PYTHON_VERSION
+        id: build
+        run: |
+          echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT
+          python pkgutils.py build-appimage --linux-tag $LINUX_TAG --python-version $PYTHON_VERSION
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: Linux-AppImage
-          path: dist_appimage
+          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Linux-AppImage
+          path: dist_appimage/*.AppImage*
           if-no-files-found: error
           retention-days: 14
diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml
index 704d3e6e..6065f892 100644
--- a/.github/workflows/build_mac.yml
+++ b/.github/workflows/build_mac.yml
@@ -25,13 +25,16 @@ jobs:
           path: novelwriter/assets
 
       - name: Build App Bundle
-        run: ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH
+        id: build
+        run: |
+          echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT
+          ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH
 
       - name: Upload DMG
         uses: actions/upload-artifact@v4
         with:
-          name: MacOS-AMD64-DMG
-          path: dist_macos
+          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-MacOS-AMD64-DMG
+          path: dist_macos/*.dmg*
           if-no-files-found: error
           retention-days: 14
 
@@ -53,12 +56,15 @@ jobs:
           path: novelwriter/assets
 
       - name: Build App Bundle
-        run: ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH
+        id: build
+        run: |
+          echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT
+          ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH
 
       - name: Upload DMG
         uses: actions/upload-artifact@v4
         with:
-          name: MacOS-M1-DMG
-          path: dist_macos
+          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-MacOS-M1-DMG
+          path: dist_macos/*.dmg*
           if-no-files-found: error
           retention-days: 14
diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
index 9b7637fc..d7db1068 100644
--- a/.github/workflows/build_win.yml
+++ b/.github/workflows/build_win.yml
@@ -26,7 +26,7 @@ jobs:
           path: novelwriter/assets
 
       - name: Build Setup Installer
-        id: build-installer
+        id: build
         run: |
           echo "BUILD_VERSION=$(python pkgutils.py version)" >> $Env:GITHUB_OUTPUT
           python pkgutils.py build-win-exe
@@ -35,7 +35,7 @@ jobs:
         id: upload-unsigned-artifact
         uses: actions/upload-artifact@v4
         with:
-          name: Win-Setup-Unsigned
+          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Win-Setup
           path: dist/*.exe
           if-no-files-found: error
           retention-days: 14
@@ -51,12 +51,12 @@ jobs:
           wait-for-completion: true
           output-artifact-directory: "dist/"
           parameters: |
-            version: "${{ steps.build-installer.outputs.BUILD_VERSION }}"
+            version: "${{ steps.build.outputs.BUILD_VERSION }}"
 
       - name: Upload Signed Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: Win-Setup-Signed
+          name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Win-Setup-Signed
           path: dist/*.exe
           if-no-files-found: error
           retention-days: 14