diff --git a/.github/workflows/e2e-staging.yml b/.github/workflows/e2e-staging.yml
index 6791bf6356..2facb6f500 100644
--- a/.github/workflows/e2e-staging.yml
+++ b/.github/workflows/e2e-staging.yml
@@ -98,17 +98,19 @@ jobs:
     name: e2e-tests-staging - ${{ 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: Enable KVM
         run: |
@@ -242,11 +244,19 @@ jobs:
     needs: [build-staging, e2e-branch, e2e-tests-staging]
     runs-on: ubuntu-latest
     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
         run: python3 scripts/slack_summary.py e2e-staging
@@ -259,4 +269,4 @@ 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 }}
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index bfa92deaf4..8a6c402ae6 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -116,17 +116,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: Enable KVM
         run: |
diff --git a/.github/workflows/e2e_migration.yml b/.github/workflows/e2e_migration.yml
index 3a5e1e20c6..9ad93829a3 100644
--- a/.github/workflows/e2e_migration.yml
+++ b/.github/workflows/e2e_migration.yml
@@ -104,17 +104,19 @@ jobs:
     name: e2e-tests - ${{ matrix.rn_version }} - ${{ matrix.scenario.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: Enable KVM
         run: |
@@ -242,11 +244,19 @@ jobs:
     needs: [build, e2e-branch, e2e-tests]
     runs-on: ubuntu-latest
     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
         run: python3 scripts/slack_summary.py e2e-migration
@@ -259,4 +269,4 @@ 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 }}