diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml
index e2ee627bcf..edc37a369b 100644
--- a/.github/workflows/workflow-build.yml
+++ b/.github/workflows/workflow-build.yml
@@ -10,12 +10,11 @@ jobs:
   get-merge-base:
     runs-on: lynx-ubuntu-24.04-medium
     env:
-      # We have 3 cases:
+      # We have 2 cases:
       #   1. Pull request
       #   2. Merge group
-      #   3. Push (deploy on main branch)
-      BASE_REF: ${{ github.base_ref || github.event.merge_group.base_ref || github.event.push.base_ref }}
-      HEAD_REF: ${{ github.head_ref || github.event.merge_group.head_ref || github.ref }}
+      BASE_REF: ${{ github.base_ref || github.event.merge_group.base_ref }}
+      HEAD_REF: ${{ github.head_ref || github.event.merge_group.head_ref }}
     outputs:
       merge-base: ${{ steps.merge-base.outputs.merge-base }}
     steps:
@@ -34,6 +33,7 @@ jobs:
           echo "head-ref=$HEAD_REF_CLEAN" >> $GITHUB_OUTPUT
       # Modified from https://github.com/rmacklin/fetch-through-merge-base
       - name: Fetch
+        if: github.event_name != 'push'
         env:
           CLEAN_BASE_REF: ${{ steps.git-refs.outputs.base-ref }}
           CLEAN_HEAD_REF: ${{ steps.git-refs.outputs.head-ref }}
@@ -52,10 +52,10 @@ jobs:
       - name: Get merge base
         id: merge-base
         env:
-          CLEAN_BASE_REF: ${{ steps.git-refs.outputs.base-ref }}
+          CLEAN_BASE_REF: ${{ format('origin/{0}', steps.git-refs.outputs.base-ref) || github.event.base }}
           CLEAN_HEAD_REF: ${{ steps.git-refs.outputs.head-ref }}
         run: |
-          echo "merge-base=$(git merge-base "origin/$CLEAN_BASE_REF" "$CLEAN_HEAD_REF" || git rev-parse origin/"$CLEAN_BASE_REF")" >> $GITHUB_OUTPUT
+          echo "merge-base=$(git merge-base "$CLEAN_BASE_REF" "$CLEAN_HEAD_REF" || git rev-parse "$CLEAN_BASE_REF")" >> $GITHUB_OUTPUT
   build-all:
     runs-on: lynx-ubuntu-24.04-xlarge
     needs: get-merge-base