diff --git a/.github/workflows/extension_bump.yml b/.github/workflows/extension_bump.yml
index 4b0ba05201a916..cbd4da3e406698 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 origin/main HEAD)"
+            PR_FORK_POINT="$(git merge-base origin/main HEAD)"
             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 92d4bc9be86ccf..ef0e28715ce038 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 origin/main HEAD)"
+            PR_FORK_POINT="$(git merge-base origin/main HEAD)"
             git checkout "$PR_FORK_POINT"
         elif BRANCH_PARENT_SHA="$(git merge-base origin/main origin/zed-zippy-autobump)"; then
             git checkout "$BRANCH_PARENT_SHA"
@@ -137,12 +137,6 @@ jobs:
             echo "Version changes happen in separate PRs and will be performed by the zed-zippy bot"
             exit 42
         fi
-    - name: extension_tests::breakpoint
-      if: failure()
-      uses: namespacelabs/breakpoint-action@ca62bf12510ebf1115a560cf337a35fad5eb052b
-      with:
-        duration: 15m
-        authorized-users: MrSubidubi
     timeout-minutes: 6
   tests_pass:
     needs:
diff --git a/tooling/xtask/src/tasks/workflows/extension_bump.rs b/tooling/xtask/src/tasks/workflows/extension_bump.rs
index d435cb9bfca5bc..88d0cf85300b79 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 origin/main HEAD)"
+            PR_FORK_POINT="$(git merge-base origin/main HEAD)"
             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_tests.rs b/tooling/xtask/src/tasks/workflows/extension_tests.rs
index 73a911d49cb453..a650013bacfcfc 100644
--- a/tooling/xtask/src/tasks/workflows/extension_tests.rs
+++ b/tooling/xtask/src/tasks/workflows/extension_tests.rs
@@ -95,23 +95,11 @@ pub(crate) fn check_extension() -> NamedJob {
         .add_step(cache_rust_dependencies_namespace()) // Extensions can compile Rust, so provide the cache if needed.
         .add_step(check())
         .add_step(check_version_job)
-        .add_step(verify_version_did_not_change(version_changed))
-        .add_step(breakpoint());
+        .add_step(verify_version_did_not_change(version_changed));
 
     named::job(job)
 }
 
-fn breakpoint() -> Step<Use> {
-    named::uses(
-        "namespacelabs",
-        "breakpoint-action",
-        "ca62bf12510ebf1115a560cf337a35fad5eb052b",
-    )
-    .if_condition(Expression::new("failure()"))
-    .add_with(("duration", "15m"))
-    .add_with(("authorized-users", "MrSubidubi"))
-}
-
 pub fn cache_zed_extension_cli() -> (Step<Use>, StepOutput) {
     let step = named::uses(
         "actions",