diff --git a/.github/release-please-config.json b/.github/release-please-config.json
index 47131b1c..f4bc995c 100644
--- a/.github/release-please-config.json
+++ b/.github/release-please-config.json
@@ -11,11 +11,7 @@
           "path": "frontend/package.json",
           "jsonpath": "$.version"
         },
-        "public/openapi.yaml",
-        "frontend/src/api/generated/client.gen.ts",
-        "frontend/src/api/generated/sdk.gen.ts",
-        "frontend/src/api/generated/types.gen.ts",
-        "frontend/src/api/generated/index.ts"
+        "public/openapi.yaml"
       ]
     }
   }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 18c8e7e3..186e25cf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,10 +47,14 @@ jobs:
 
   openapi:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v6
         with:
           token: ${{ secrets.RELEASE_PLEASE_TOKEN || github.token }}
+          ref: ${{ (github.event_name == 'pull_request' && startsWith(github.head_ref, 'release-please--')) && github.head_ref || github.sha }}
+          fetch-depth: 0
 
       - uses: ruby/setup-ruby@v1
         with:
@@ -87,11 +91,16 @@ jobs:
           make openapi-client
           
           git add public/openapi.yaml frontend/src/api/generated/
-          git commit -m "chore: regenerate openapi spec and client for version bump"
-          git push
           
-          echo "## OpenAPI artifacts regenerated" >> "$GITHUB_STEP_SUMMARY"
-          echo "Version bump detected; OpenAPI spec and frontend client have been regenerated and committed." >> "$GITHUB_STEP_SUMMARY"
+          if git diff --staged --quiet; then
+            echo "No changes to commit"
+          else
+            git commit -m "chore: regenerate openapi spec and client for version bump"
+            git push origin ${{ github.head_ref }}
+            
+            echo "## OpenAPI artifacts regenerated" >> "$GITHUB_STEP_SUMMARY"
+            echo "Version bump detected; OpenAPI spec and frontend client have been regenerated and committed." >> "$GITHUB_STEP_SUMMARY"
+          fi
 
       - name: Lint OpenAPI contract
         run: make openapi-lint