diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5d82fefdd..59fa207ad 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,6 +60,7 @@ jobs:
           publish: pnpm changeset publish
           version: pnpm changeset:version-and-format
           commit: 'ci(changesets): version packages'
+          commitMode: 'github-api'
         env:
           GITHUB_TOKEN: ${{ steps.generate_github_token.outputs.token }}
 
@@ -67,7 +68,10 @@ jobs:
       - name: Publishing canary releases to npm registry
         if: steps.changesets.outputs.published != 'true'
         run: |
-          git checkout main
+          set -euo pipefail
+          git fetch origin main
+          git reset --hard origin/main
+          git clean -fd
           pnpm changeset version --snapshot canary
           pnpm changeset publish --tag canary
         env: