diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 1bee8734..7a95be79 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -62,5 +62,9 @@ jobs:
           git config user.email "ci@git.mcintire.me"
           git config user.name "CI"
           git add k8s/deployment.yaml
-          git diff --cached --quiet || git commit -m "chore: update towerops-web image to ${{ steps.meta.outputs.tag }} [skip ci]"
-          git push origin HEAD:main
+          if ! git diff --cached --quiet; then
+            git commit -m "chore: update towerops-web image to ${{ steps.meta.outputs.tag }} [skip ci]"
+            # Pull with rebase to handle concurrent pushes
+            git pull --rebase origin main
+            git push origin HEAD:main
+          fi