diff --git a/.gitea/workflows/ota-build.yml b/.gitea/workflows/ota-build.yml
index 9c6e83c..131c580 100644
--- a/.gitea/workflows/ota-build.yml
+++ b/.gitea/workflows/ota-build.yml
@@ -28,12 +28,16 @@ jobs:
           python -m pip install --upgrade pip
           pip install platformio
 
+      - name: Remove stale OTA package files
+        run: rm -f dist/*.tslpkg
+
       - name: Build filesystem-aware OTA package
         run: python scripts/build_ota_package.py
 
       - name: Prepare direct OTA files
         run: |
           set -eu
+          rm -rf dist/ota
           mkdir -p dist/ota
           count=0
           for file in dist/*.tslpkg; do
@@ -52,9 +56,10 @@ jobs:
           GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
         run: |
           set -eu
+          package_owner="${GITHUB_ACTOR}"
           package_name="$(printf '%s' "${GITHUB_REPOSITORY#*/}" | tr '[:upper:]' '[:lower:]')-ota"
           package_version="${GITHUB_SHA}"
-          base_url="${GITHUB_SERVER_URL}/api/packages/${GITHUB_REPOSITORY_OWNER}/generic/${package_name}/${package_version}"
+          base_url="${GITHUB_SERVER_URL}/api/packages/${package_owner}/generic/${package_name}/${package_version}"
           for file in dist/ota/*; do
             [ -f "$file" ] || continue
             curl --fail --silent --show-error --user "${GITHUB_ACTOR}:${GITEA_TOKEN}" --upload-file "$file" "${base_url}/$(basename "$file")"
@@ -66,9 +71,10 @@ jobs:
           GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
         run: |
           set -eu
+          package_owner="${GITHUB_ACTOR}"
           package_name="$(printf '%s' "${GITHUB_REPOSITORY#*/}" | tr '[:upper:]' '[:lower:]')-ota"
           package_version="${GITHUB_SHA}"
-          curl --fail --silent --show-error --user "${GITHUB_ACTOR}:${GITEA_TOKEN}" "${GITHUB_SERVER_URL}/api/v1/packages/${GITHUB_REPOSITORY_OWNER}/generic/${package_name}/${package_version}/files" > /tmp/package-files.json
+          curl --fail --silent --show-error --user "${GITHUB_ACTOR}:${GITEA_TOKEN}" "${GITHUB_SERVER_URL}/api/v1/packages/${package_owner}/generic/${package_name}/${package_version}/files" > /tmp/package-files.json
           python3 - <<'PY'
           import json
           from pathlib import Path