diff --git a/.gitea/workflows/build-apk.yml b/.gitea/workflows/build-apk.yml
index 479c71d..a5c4af7 100644
--- a/.gitea/workflows/build-apk.yml
+++ b/.gitea/workflows/build-apk.yml
@@ -3,7 +3,6 @@ name: build-apk
 on:
   push:
     branches: [master]
-    tags: ['v*']
   workflow_dispatch:
 
 jobs:
@@ -59,8 +58,42 @@ jobs:
         env:
           DEEPSEEK_API_KEY: ${{ secrets.DEEPSEEK_API_KEY }}
 
+      - name: Compute next version
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          set -euxo pipefail
+          API="${{ github.api_url }}/repos/${GITHUB_REPOSITORY}"
+          TAGS=$(curl -sS -H "Authorization: token $GITHUB_TOKEN" "$API/tags?limit=100")
+          LAST=$(echo "$TAGS" | python3 -c "
+          import json, sys
+          tags = [t['name'] for t in json.load(sys.stdin) if t['name'].startswith('v')]
+          def key(n):
+              try:
+                  return tuple(int(x) for x in n[1:].split('.')[:3])
+              except ValueError:
+                  return (0, 0, 0)
+          print(max(tags, key=key) if tags else '')
+          ")
+          if [ -z "$LAST" ]; then
+            NEXT="1.0.0"
+            CODE=10000
+          else
+            IFS=. read -r MAJOR MINOR PATCH <<< "${LAST#v}"
+            MINOR=${MINOR:-0}
+            PATCH=${PATCH:-0}
+            PATCH=$((PATCH + 1))
+            NEXT="${MAJOR}.${MINOR}.${PATCH}"
+            CODE=$((MAJOR * 10000 + MINOR * 100 + PATCH))
+          fi
+          echo "NEXT_VERSION=${NEXT}" >> "$GITHUB_ENV"
+          echo "NEXT_CODE=${CODE}" >> "$GITHUB_ENV"
+          echo "== Version =="
+          echo "  last release tag: ${LAST:-none}"
+          echo "  next build:       v${NEXT} (versionCode ${CODE})"
+
       - name: Build debug APK
-        run: flutter build apk --debug
+        run: flutter build apk --debug --build-name=$NEXT_VERSION --build-number=$NEXT_CODE
 
       - name: Restore release keystore
         run: |
@@ -72,7 +105,10 @@ jobs:
             "${{ secrets.KEY_PASSWORD }}" > android/key.properties
 
       - name: Build release APK
-        run: flutter build apk --release
+        run: flutter build apk --release --build-name=$NEXT_VERSION --build-number=$NEXT_CODE
+
+      - name: Show built APKs
+        run: ls -lh build/app/outputs/flutter-apk/
 
       - name: Upload debug APK
         # Gitea Actions supports only the v3 artifact protocol;
@@ -88,30 +124,51 @@ jobs:
           name: onbudget-release-apk
           path: build/app/outputs/flutter-apk/app-release.apk
 
-      - name: Create Gitea release
-        if: startsWith(github.ref, 'refs/tags/')
+      - name: Create tag + Gitea release
+        # Releases are created only from master runs. The tag v<NEXT_VERSION>
+        # is auto-created and triggers no further workflow runs (no tag trigger).
+        if: github.ref == 'refs/heads/master'
         env:
           GITHUB_TOKEN: ${{ github.token }}
         run: |
-          set -eux
-          # Releases only for tags that point at the master branch tip —
-          # a tag pushed to a feature/dev branch never creates a release.
-          git fetch origin master
-          if [ "$(git rev-parse HEAD)" != "$(git rev-parse FETCH_HEAD)" ]; then
-            echo "Tag ${GITHUB_REF_NAME} does not point to master — skipping release creation"
-            exit 0
-          fi
-          TAG=${GITHUB_REF_NAME}
+          set -euxo pipefail
           API="${{ github.api_url }}/repos/${GITHUB_REPOSITORY}"
-          REL=$(curl -s -X POST "$API/releases" \
+          TAG_COMMIT=$(git rev-parse HEAD)
+          echo "== Creating tag v${NEXT_VERSION} at ${TAG_COMMIT} =="
+          TAG_RESP=$(curl -sS -X POST "$API/git/refs" \
             -H "Authorization: token $GITHUB_TOKEN" \
             -H "Content-Type: application/json" \
-            -d "{\"tag_name\":\"${TAG}\",\"name\":\"${TAG}\",\"body\":\"OnBudget ${TAG} — debug + release APKs\"}")
-          ID=$(echo "$REL" | python3 -c "import json,sys; print(json.load(sys.stdin)['id'])")
-          echo "release id: ${ID}"
+            -d "{\"ref\":\"refs/tags/v${NEXT_VERSION}\",\"sha\":\"${TAG_COMMIT}\"}")
+          echo "$TAG_RESP" | python3 -c "
+          import json, sys
+          d = json.load(sys.stdin)
+          if 'ref' in d:
+              print('  tag created: ' + d['ref'])
+          elif 'message' in d and 'already' in str(d['message']).lower():
+              print('  tag already exists: ' + str(d['message']))
+          else:
+              print('  unexpected response: ' + json.dumps(d), file=sys.stderr)
+              sys.exit(1)
+          "
+          echo "== Creating Gitea release v${NEXT_VERSION} =="
+          REL=$(curl -sS -X POST "$API/releases" \
+            -H "Authorization: token $GITHUB_TOKEN" \
+            -H "Content-Type: application/json" \
+            -d "{\"tag_name\":\"v${NEXT_VERSION}\",\"name\":\"v${NEXT_VERSION}\",\"body\":\"OnBudget v${NEXT_VERSION} — debug + release APKs\"}")
+          ID=$(echo "$REL" | python3 -c "
+          import json, sys
+          d = json.load(sys.stdin)
+          if 'id' not in d:
+              print('API error: ' + json.dumps(d), file=sys.stderr)
+              sys.exit(1)
+          print('  release: ' + str(d.get('html_url', d.get('url'))), file=sys.stderr)
+          print(d['id'])
+          ")
+          echo "== Uploading APKs to release =="
           for f in build/app/outputs/flutter-apk/app-debug.apk build/app/outputs/flutter-apk/app-release.apk; do
-            echo "uploading $(basename "$f")"
-            curl -s -X POST "$API/releases/${ID}/assets?name=$(basename "$f")" \
+            echo "  $(basename "$f") ($(du -h "$f" | cut -f1))"
+            curl -sS -X POST "$API/releases/${ID}/assets?name=$(basename "$f")" \
               -H "Authorization: token $GITHUB_TOKEN" \
-              -F "attachment=@$f" | python3 -c "import json,sys; d=json.load(sys.stdin); print('  ok:', d.get('name'))"
+              -F "attachment=@$f" | python3 -c "import json,sys; d=json.load(sys.stdin); print('    ok:', d.get('name'), 'size:', d.get('size'))"
           done
+          echo "== Done: v${NEXT_VERSION} release created =="