diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index f4c51a4..7c5af00 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -49,15 +49,21 @@ jobs:
           cd $WORK
           SHORT=${GITHUB_SHA::8}
           echo "Updating tag to ${SHORT}"
+          # Set up git auth using token
+          git remote set-url origin "http://joe:${GITEA_TOKEN}@192.168.1.212:3000/joe/demo-go-api.git"
+          git config user.email "ci@local"
+          git config user.name "gitea-ci"
+          # Update tag in values.yaml
           sed -i "s/^  tag:.*/  tag: \"${SHORT}\"/" deploy/helm/values.yaml
           echo "--- diff ---"
           git diff deploy/helm/values.yaml || true
-          git config user.email "ci@local"
-          git config user.name "gitea-ci"
+          # Check if there are changes
           if git diff --quiet deploy/helm/values.yaml; then
             echo "No changes to commit"
             exit 0
           fi
+          # Pull latest to avoid conflicts
+          git pull --rebase origin main || git pull origin main --rebase
           git add deploy/helm/values.yaml
           git commit -m "ci: update image tag to ${SHORT}"
           git push origin main