diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 2ceee5e7f..a124aa20c 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -24,27 +24,34 @@ jobs:
       - name: Get version
         id: get_version
         run: |
-          if [[ "$GITHUB_REF_NAME" == "flatpak" ]]; then
-            echo "version=${GITHUB_SHA::8}" >> "$GITHUB_OUTPUT"
+          if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
+            version="${GITHUB_REF_NAME#v}"
+          elif [[ "$GITHUB_REF_NAME" == "flatpak" ]]; then
+            version="${GITHUB_SHA::8}"
           else
-            echo "version=${GITHUB_REF_NAME#v}" >> "$GITHUB_OUTPUT"
+            version="${GITHUB_REF_NAME//\//-}-${GITHUB_SHA::8}"
           fi
+          echo "version=$version" >> "$GITHUB_OUTPUT"
+          echo "bundle=sdrangel-$version-$ARCH.flatpak" >> "$GITHUB_OUTPUT"
       - name: Validate runner architecture
         run: |
-          test "$(uname -m)" = "$ARCH"
+          if [[ "$(uname -m)" != "$ARCH" ]]; then
+            echo "Expected architecture $ARCH but got $(uname -m)" >&2
+            exit 1
+          fi
       - name: Build Flatpak
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
-          bundle: sdrangel-${{ steps.get_version.outputs.version }}-${{ env.ARCH }}.flatpak
+          bundle: ${{ steps.get_version.outputs.bundle }}
           manifest-path: flatpak/org.sdrangel.SDRangel.yaml
           cache-key: flatpak-builder-${{ github.sha }}
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: sdrangel-${{ steps.get_version.outputs.version }}-${{ env.ARCH }}.flatpak
-          path: sdrangel-${{ steps.get_version.outputs.version }}-${{ env.ARCH }}.flatpak
+          name: ${{ steps.get_version.outputs.bundle }}
+          path: ${{ steps.get_version.outputs.bundle }}
       - name: Upload release
         if: startsWith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v2
         with:
-          files: sdrangel-${{ steps.get_version.outputs.version }}-${{ env.ARCH }}.flatpak
+          files: ${{ steps.get_version.outputs.bundle }}