diff --git a/.github/workflows/update_manifests.yml b/.github/workflows/update_manifests.yml
index d983409..207ca04 100644
--- a/.github/workflows/update_manifests.yml
+++ b/.github/workflows/update_manifests.yml
@@ -8,6 +8,11 @@ permissions:
     contents: write
     pull-requests: read
 
+# Limit concurrency per branch to prevent push issues.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
     update-manifests:
         runs-on: ubuntu-latest
@@ -30,6 +35,10 @@ jobs:
             - name: Build
               run: pnpm run build
 
+            - name: Pull before updating manifest
+              run: |
+                  git pull
+
             - name: Update manifests
               uses: actions/github-script@v7
               with:
@@ -44,4 +53,5 @@ jobs:
                   git config --global user.email 'github-actions[bot]@users.noreply.github.com'
                   git add .
                   git commit -m "Update after PR with OTA images merged" || echo 'Nothing to commit'
+                  git pull --rebase
                   git push