diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c114c86bf..e3435e66f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,6 +81,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
+          fetch-tags: true
 
       - uses: oven-sh/setup-bun@v1
         with:
@@ -92,11 +93,16 @@ jobs:
           bun run build
           bun deploy:electron
 
+      - name: Build name
+        run: |
+          echo "full_tag_name=$(git describe --tags)" >> $GITHUB_OUTPUT
+          mv dist/Cockpit*.${{ matrix.extension }} dist/Cockpit-${{ matrix.suffix }}-${{ steps.prepare.outputs.full_tag_name }}.${{ matrix.extension }}
+
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
           name: cockpit-${{ matrix.suffix }}
-          path: dist/Cockpit*.${{ matrix.extension }}
+          path: dist/Cockpit-${{ matrix.suffix }}-*.${{ matrix.extension }}
           if-no-files-found: error
 
       - name: Upload Release
@@ -104,7 +110,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/') && success()
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: dist/Cockpit*.${{ matrix.extension }}
+          path: dist/Cockpit-${{ matrix.suffix }}-*.${{ matrix.extension }}
           tag: ${{ github.ref }}
           overwrite: true
           prerelease: true
@@ -119,6 +125,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
+          fetch-tags: true
 
       - uses: oven-sh/setup-bun@v1
         with:
@@ -137,6 +144,11 @@ jobs:
           bun run build
           env DEBUG="@malept/flatpak-bundler" bun deploy:flatpak
 
+      - name: Build name
+        run: |
+          echo "full_tag_name=$(git describe --tags)" >> $GITHUB_OUTPUT
+          mv dist/Cockpit*.${{ matrix.extension }} dist/Cockpit-${{ matrix.suffix }}-${{ steps.prepare.outputs.full_tag_name }}.flatpak
+
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with: