diff --git a/.github/workflows/e2e-staging.yml b/.github/workflows/e2e-staging.yml
index 84e0f6278..1ea4308bc 100644
--- a/.github/workflows/e2e-staging.yml
+++ b/.github/workflows/e2e-staging.yml
@@ -136,17 +136,19 @@ jobs:
       BACKEND: regtest
 
     steps:
-      - name: Show selected E2E branch
-        env:
-          E2E_BRANCH: ${{ needs.e2e-branch.outputs.branch }}
-        run: echo $E2E_BRANCH
+      - name: Resolve E2E tests ref
+        id: e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
+        with:
+          selected: ${{ needs.e2e-branch.outputs.branch }}
+          e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
 
       - name: Clone E2E tests
         uses: actions/checkout@v7
         with:
           repository: synonymdev/bitkit-e2e-tests
           path: bitkit-e2e-tests
-          ref: ${{ needs.e2e-branch.outputs.branch }}
+          ref: ${{ steps.e2e-ref.outputs.ref }}
 
       - name: Download iOS app (regtest)
         uses: actions/download-artifact@v8
@@ -262,11 +264,19 @@ jobs:
     needs: [build-staging, e2e-branch, e2e-tests-staging]
 
     steps:
+      - name: Resolve E2E tests ref
+        id: e2e-ref
+        continue-on-error: true
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
+        with:
+          selected: ${{ needs.e2e-branch.outputs.branch }}
+          e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
+
       - name: Checkout E2E tests
         uses: actions/checkout@v7
         with:
           repository: synonymdev/bitkit-e2e-tests
-          ref: ${{ needs.e2e-branch.outputs.branch }}
+          ref: ${{ steps.e2e-ref.outputs.ref || 'main' }}
 
       - name: Post Slack summary
         env:
@@ -278,5 +288,5 @@ jobs:
           E2E_TESTS_RESULT: ${{ needs.e2e-tests-staging.result }}
           RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           RUN_ATTEMPT: ${{ github.run_attempt }}
-          E2E_TESTS_REF: ${{ needs.e2e-branch.outputs.branch }}
+          E2E_TESTS_REF: ${{ steps.e2e-ref.outputs.ref }}
         run: python3 scripts/slack_summary.py e2e-staging
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index ebc2390f9..d84ac0e75 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -157,17 +157,19 @@ jobs:
     name: e2e-tests-local - ${{ matrix.shard.name }}
 
     steps:
-      - name: Show selected E2E branch
-        env:
-          E2E_BRANCH: ${{ needs.e2e-branch.outputs.branch }}
-        run: echo $E2E_BRANCH
+      - name: Resolve E2E tests ref
+        id: e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
+        with:
+          selected: ${{ needs.e2e-branch.outputs.branch }}
+          e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
 
       - name: Clone E2E tests
         uses: actions/checkout@v7
         with:
           repository: synonymdev/bitkit-e2e-tests
           path: bitkit-e2e-tests
-          ref: ${{ needs.e2e-branch.outputs.branch }}
+          ref: ${{ steps.e2e-ref.outputs.ref }}
 
       - name: Download iOS app
         uses: actions/download-artifact@v8
diff --git a/.github/workflows/e2e_migration.yml b/.github/workflows/e2e_migration.yml
index efc8505d0..04ab743b9 100644
--- a/.github/workflows/e2e_migration.yml
+++ b/.github/workflows/e2e_migration.yml
@@ -123,10 +123,24 @@ jobs:
       app_branch: ${{ github.head_ref || github.ref_name }}
       e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
 
+  resolve-e2e-ref:
+    if: github.event_name != 'pull_request' || (github.event.pull_request.draft == false && (startsWith(github.head_ref, 'release-') || startsWith(github.base_ref, 'release-')))
+    needs: [e2e-branch]
+    runs-on: ubuntu-latest
+    outputs:
+      ref: ${{ steps.e2e-ref.outputs.ref }}
+    steps:
+      - name: Resolve E2E tests ref
+        id: e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
+        with:
+          selected: ${{ needs.e2e-branch.outputs.branch }}
+          e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
+
   prepare-wallets:
     if: github.event_name != 'pull_request' || (github.event.pull_request.draft == false && (startsWith(github.head_ref, 'release-') || startsWith(github.base_ref, 'release-')))
     uses: synonymdev/bitkit-e2e-tests/.github/workflows/migration-wallet-setup.yml@main
-    needs: [e2e-branch]
+    needs: [e2e-branch, resolve-e2e-ref]
     strategy:
       fail-fast: false
       matrix:
@@ -138,7 +152,7 @@ jobs:
           - { name: migration_3-with-passphrase, setup_type: passphrase }
           - { name: migration_4-with-sweep, setup_type: sweep }
     with:
-      e2e_branch: ${{ needs.e2e-branch.outputs.branch }}
+      e2e_branch: ${{ needs.resolve-e2e-ref.outputs.ref }}
       rn_version: ${{ matrix.rn_version }}
       setup_type: ${{ matrix.scenario.setup_type }}
       scenario_name: ${{ matrix.scenario.name }}
@@ -165,17 +179,19 @@ jobs:
       BACKEND: regtest
 
     steps:
-      - name: Show selected E2E branch
-        env:
-          E2E_BRANCH: ${{ needs.e2e-branch.outputs.branch }}
-        run: echo $E2E_BRANCH
+      - name: Resolve E2E tests ref
+        id: e2e-ref
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
+        with:
+          selected: ${{ needs.e2e-branch.outputs.branch }}
+          e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
 
       - name: Clone E2E tests
         uses: actions/checkout@v7
         with:
           repository: synonymdev/bitkit-e2e-tests
           path: bitkit-e2e-tests
-          ref: ${{ needs.e2e-branch.outputs.branch }}
+          ref: ${{ steps.e2e-ref.outputs.ref }}
 
       - name: Download iOS app
         uses: actions/download-artifact@v8
@@ -336,11 +352,19 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build, e2e-branch, prepare-wallets, e2e-tests]
     steps:
+      - name: Resolve E2E tests ref
+        id: e2e-ref
+        continue-on-error: true
+        uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
+        with:
+          selected: ${{ needs.e2e-branch.outputs.branch }}
+          e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
+
       - name: Checkout E2E tests
         uses: actions/checkout@v7
         with:
           repository: synonymdev/bitkit-e2e-tests
-          ref: ${{ needs.e2e-branch.outputs.branch }}
+          ref: ${{ steps.e2e-ref.outputs.ref || 'main' }}
 
       - name: Post Slack summary
         env:
@@ -353,5 +377,5 @@ jobs:
           E2E_TESTS_RESULT: ${{ needs.e2e-tests.result }}
           RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           RUN_ATTEMPT: ${{ github.run_attempt }}
-          E2E_TESTS_REF: ${{ needs.e2e-branch.outputs.branch }}
+          E2E_TESTS_REF: ${{ steps.e2e-ref.outputs.ref }}
         run: python3 scripts/slack_summary.py e2e-migration