diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index f0814cc..ccf93b3 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -224,7 +224,13 @@ jobs:
           if git status --porcelain | grep .; then
             git add **/*.tar.bz2 sha256sums.txt
             git commit -m "Update base images and checksum for ${{ matrix.version }} on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
-            git push
+
+            # Fetch latest changes and rebase local commits on top
+            git pull --rebase origin main || true
+
+            # Push after rebase
+            git push origin main
+
             echo "archives_changed=true" >> $GITEA_OUTPUT
           else
             echo "[INFO] No changes to commit."