diff --git a/.github/workflows/patch-build.yaml b/.github/workflows/patch-build.yaml
index 146c91d4f..e23775055 100644
--- a/.github/workflows/patch-build.yaml
+++ b/.github/workflows/patch-build.yaml
@@ -23,6 +23,9 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 1
+    - name: Rebase with main branch, to make sure the code has latest main changes
+      run: |
+        git pull --rebase origin main
 
     - name: Downloading yq
       run: |