diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 4464beb..b71d81f 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -91,4 +91,6 @@ jobs:
         git config user.email "github-actions[bot]@users.noreply.github.com"
         git add k8s/manifest.yaml
         git commit -m "chore: update manifest image to 1.0.${{ github.run_number }} [skip ci]"
+        # Pull any commits pushed since this workflow started, then push
+        git pull --rebase origin main
         git push