diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 3eebeb34ad..12ee8ed6b7 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Fetch PR number
         id: get-pr
         run: |
-          PR_NUMBER=$(gh pr list --state merged --base main --json number --jq '.[0].number' || echo "")
+          PR_NUMBER=$(gh pr list --state merged --base main --search $(git rev-parse HEAD) --json number --jq '.[0].number' || echo "")
           echo "PR_NUMBER=${PR_NUMBER}" >> $GITHUB_ENV
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}