diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml
index 3a974cc..6dc741c 100644
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -129,10 +129,17 @@ jobs:
 
       - name: Copy new APK to repo
         run: |
-          # The app-release.apk name should ideally include the version number
-          # so it doesn't overwrite older versions in the repo.
-          VERSION_TAG=${GITHUB_REF#refs/tags/} # gets 'v1.0.0'
-          cp build/app/outputs/flutter-apk/app-release.apk fdroid/repo/my_flutter_app_${VERSION_TAG}.apk
+          set -e
+          mkdir -p fdroid/repo
+
+          # Prefer tag name for release builds; fallback to ref name for manual runs.
+          REF_NAME="${GITHUB_REF_NAME:-${GITHUB_REF##*/}}"
+          SAFE_REF_NAME="$(echo "$REF_NAME" | tr '/ ' '__' | tr -cd '[:alnum:]_.-')"
+          if [ -z "$SAFE_REF_NAME" ]; then
+            SAFE_REF_NAME="${GITHUB_SHA:-manual}"
+          fi
+
+          cp build/app/outputs/flutter-apk/app-release.apk "fdroid/repo/my_flutter_app_${SAFE_REF_NAME}.apk"
 
       - name: Generate F-Droid Index
         run: |