diff --git a/.github/workflows/prereleases.yml b/.github/workflows/prereleases.yml
index 05f80c91..7750db55 100644
--- a/.github/workflows/prereleases.yml
+++ b/.github/workflows/prereleases.yml
@@ -29,7 +29,10 @@ jobs:
 
           # Create local main branch pointing to origin/main
           # Changeset looks for local "main" branch, not origin/main
-          git branch -f main origin/main
+          # Only force update if main is not the current branch (to avoid worktree error)
+          if [ "$(git branch --show-current)" != "main" ]; then
+            git branch -f main origin/main
+          fi
 
       - name: Detect changed packages
         id: changeset
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bfd77099..4abf8c44 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,6 +29,7 @@ jobs:
         uses: changesets/action@v1
         with:
           publish: pnpm exec changeset publish
+          commit: 'chore: version packages'
         env:
           GITHUB_TOKEN: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
           NODE_ENV: 'production'