diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py
index 280935b3..4d1b05a7 100644
--- a/webhook_server_container/libs/github_api.py
+++ b/webhook_server_container/libs/github_api.py
@@ -1642,6 +1642,7 @@ def _prepare_cloned_repo_dir(
             # Checkout to requested branch/tag
             if checkout:
                 run_command(f"{git_cmd} checkout {checkout}", log_prefix=self.log_prefix)
+                run_command(f"{git_cmd} rebase {self.pull_request_branch}", log_prefix=self.log_prefix)
 
             # Checkout the branch if pull request is merged or for release
             else:
@@ -1662,6 +1663,7 @@ def _prepare_cloned_repo_dir(
                     run_command(
                         command=f"{git_cmd} checkout origin/pr/{pull_request.number}", log_prefix=self.log_prefix
                     )
+                    run_command(f"{git_cmd} rebase {self.pull_request_branch}", log_prefix=self.log_prefix)
 
             yield