diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 3dc95a2d..fea70b87 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -1,5 +1,6 @@
 name: E2E Tests
 on:
+  workflow_call:
   schedule:
     - cron: "0 6 * * 1"  # Weekly Monday 6 AM UTC
   workflow_dispatch:
diff --git a/.github/workflows/staging-ci.yml b/.github/workflows/staging-ci.yml
index 1ad86912..9aaf05e8 100644
--- a/.github/workflows/staging-ci.yml
+++ b/.github/workflows/staging-ci.yml
@@ -146,7 +146,7 @@ jobs:
         if: steps.ahead-check.outputs.commits_ahead != '0'
         run: |
           SHORT_SHA=$(echo "${{ needs.check-changes.outputs.current_head }}" | cut -c1-8)
-          BRANCH="staging-promote/${SHORT_SHA}"
+          BRANCH="staging-promote/${SHORT_SHA}-${{ github.run_id }}"
           git checkout -b "$BRANCH"
           git push origin "$BRANCH"
           echo "branch=${BRANCH}" >> "$GITHUB_OUTPUT"
@@ -392,6 +392,7 @@ jobs:
           fi
 
       - name: Merge promotion PR
+        id: merge
         if: steps.evaluate.outputs.passed == 'true'
         env:
           GH_TOKEN: ${{ steps.token.outputs.token }}
@@ -399,7 +400,8 @@ jobs:
         run: |
           if [ -n "$PR_NUMBER" ]; then
             echo "Merging promotion PR #${PR_NUMBER}"
-            gh pr merge "$PR_NUMBER" --merge --delete-branch || echo "::warning::Auto-merge failed for PR #${PR_NUMBER}"
+            gh pr merge "$PR_NUMBER" --merge --delete-branch
+            echo "merged=true" >> "$GITHUB_OUTPUT"
           fi
 
   # ── Update tested tag (always, so next batch covers only new commits) ──
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5b7d3c1a..14d10ef3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,5 +1,6 @@
 name: Run Tests
 on:
+  workflow_call:
   pull_request:
   push:
     branches: