diff --git a/.github/workflows/sdk-unstable-branch.yaml b/.github/workflows/sdk-unstable-branch.yaml
index 3e624456..80db8e14 100644
--- a/.github/workflows/sdk-unstable-branch.yaml
+++ b/.github/workflows/sdk-unstable-branch.yaml
@@ -27,7 +27,7 @@ jobs:
         run: |
           git config user.name jellyfin-bot
           git config user.email team@jellyfin.org
-          git rebase origin/master
+          git rebase --strategy-option theirs origin/master
 
       - name: Set up Node.js
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
@@ -36,6 +36,9 @@ jobs:
           check-latest: true
           cache: npm
 
+      - name: Install Node.js dependencies
+        run: npm ci --no-audit
+
       - name: Download unstable OpenAPI schema
         run: |
           curl -sL https://api.jellyfin.org/openapi/jellyfin-openapi-unstable.json -o openapi.json
@@ -47,9 +50,6 @@ jobs:
           VERSION=$(jq -r .info.version openapi.json)
           echo "UNSTABLE_API_VERSION=${VERSION}" >> $GITHUB_ENV
 
-      - name: Install Node.js dependencies
-        run: npm ci --no-audit
-
       - name: Update generated sources
         run: |
           cp $HOME/openapi.json .
@@ -59,8 +59,7 @@ jobs:
       - name: Commit changes
         continue-on-error: true
         run: |
-          ! git diff --exit-code
-          git commit --all --amend -m "Update OpenAPI to unstable"
+          ! git diff --exit-code && git commit --all --amend -m "Update OpenAPI to unstable"
 
       - name: Push changes
         run: git push --force origin openapi-unstable