diff --git a/.github/workflows/extension_bump.yml b/.github/workflows/extension_bump.yml
index ff903eb63d30319b5df5ced9c0ec545bb15cca06..db6c7e1bbcb3f56ccbebe40a4f14a673318812b9 100644
--- a/.github/workflows/extension_bump.yml
+++ b/.github/workflows/extension_bump.yml
@@ -40,7 +40,7 @@ jobs:
         CURRENT_VERSION="$(sed -n 's/^version = \"\(.*\)\"/\1/p' < extension.toml | tr -d '[:space:]')"
 
         if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            PR_FORK_POINT="$(git merge-base --fork-point main)"
+            PR_FORK_POINT="$(git merge-base --fork-point origin/main)"
             git checkout "$PR_FORK_POINT"
         elif BRANCH_PARENT_SHA="$(git merge-base origin/main origin/zed-zippy-autobump)"; then
             git checkout "$BRANCH_PARENT_SHA"
diff --git a/.github/workflows/extension_tests.yml b/.github/workflows/extension_tests.yml
index c74dcdab8df2bb7d22ab403cfe25090e9d1bd512..0a10bce2c75cd15e9aaa5cf3d2b8663500d9a80a 100644
--- a/.github/workflows/extension_tests.yml
+++ b/.github/workflows/extension_tests.yml
@@ -115,7 +115,7 @@ jobs:
         CURRENT_VERSION="$(sed -n 's/^version = \"\(.*\)\"/\1/p' < extension.toml | tr -d '[:space:]')"
 
         if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            PR_FORK_POINT="$(git merge-base --fork-point main)"
+            PR_FORK_POINT="$(git merge-base --fork-point origin/main)"
             git checkout "$PR_FORK_POINT"
         elif BRANCH_PARENT_SHA="$(git merge-base origin/main origin/zed-zippy-autobump)"; then
             git checkout "$BRANCH_PARENT_SHA"
diff --git a/tooling/xtask/src/tasks/workflows/extension_bump.rs b/tooling/xtask/src/tasks/workflows/extension_bump.rs
index bdc25f766e367042883ab7051676c7aa08873243..a2b618a88fe521222fbd971a7d42bc6686ab84a9 100644
--- a/tooling/xtask/src/tasks/workflows/extension_bump.rs
+++ b/tooling/xtask/src/tasks/workflows/extension_bump.rs
@@ -151,7 +151,7 @@ pub(crate) fn compare_versions() -> (Step<Run>, StepOutput, StepOutput) {
         CURRENT_VERSION="$({VERSION_CHECK})"
 
         if [[ "${{{{ github.event_name }}}}" == "pull_request" ]]; then
-            PR_FORK_POINT="$(git merge-base --fork-point main)"
+            PR_FORK_POINT="$(git merge-base --fork-point origin/main)"
             git checkout "$PR_FORK_POINT"
         elif BRANCH_PARENT_SHA="$(git merge-base origin/main origin/zed-zippy-autobump)"; then
             git checkout "$BRANCH_PARENT_SHA"