diff --git a/.gitea/workflows/morskaRelease.yml b/.gitea/workflows/morskaRelease.yml
index d382b56..7182098 100644
--- a/.gitea/workflows/morskaRelease.yml
+++ b/.gitea/workflows/morskaRelease.yml
@@ -34,6 +34,7 @@ jobs:
         run: |
           node .gitea/scripts/getLatestRunWithArtifacts.js
           echo "Resolved run_id: $(cat .gitea/.cache/run_id)"
+          echo "run_id=$(cat .gitea/.cache/run_id)" >> "$GITHUB_OUTPUT"
 
       - name: Download frontend artifact
         env:
@@ -62,13 +63,14 @@ jobs:
           ls -laR artifacts/webapi || true
           echo "::endgroup::"
           
-      - name: Resolve latest run that exposes required artifacts
-        id: resolve
+      - name: Tokenize (replace #{...}# from secrets/vars)
         env:
-          GITEA_PAT: ${{ secrets.GITEATOKEN }}
-        run: |
-          node .gitea/scripts/getLatestRunWithArtifacts.js
-          echo "run_id=$(cat .gitea/.cache/run_id)" >> "$GITHUB_OUTPUT"
+          SECRETS: ${{ toJson(secrets) }}
+          VARIABLES: ${{ toJson(vars) }}
+          RUN_ID: ${{ steps.resolve.outputs.run_id }}
+          run: |
+            set -euo pipefail
+            node .gitea/scripts/replaceTokens.js
           
       - name: Package artifacts as ZIPs
         run: |