diff --git a/.github/actions/setup-git-committer/action.yml b/.github/actions/setup-git-committer/action.yml
index 4367996bd..e039119fd 100644
--- a/.github/actions/setup-git-committer/action.yml
+++ b/.github/actions/setup-git-committer/action.yml
@@ -30,3 +30,8 @@ runs:
         git config --global user.name "${slug}[bot]"
         git config --global user.email "${slug}[bot]@users.noreply.github.com"
       shell: bash
+
+    - name: Configure git remote
+      run: |
+        git remote set-url origin https://x-access-token:${{ steps.apptoken.outputs.token }}@github.com/${{ github.repository }}
+      shell: bash
diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml
index 15c99f402..cae20a244 100644
--- a/.github/workflows/generate.yml
+++ b/.github/workflows/generate.yml
@@ -25,6 +25,7 @@ jobs:
         uses: ./.github/actions/setup-bun
 
       - name: Setup git committer
+        id: committer
         uses: ./.github/actions/setup-git-committer
         with:
           opencode-app-id: ${{ vars.OPENCODE_APP_ID }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 73755153a..dd0487c40 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -242,10 +242,6 @@ jobs:
           opencode-app-id: ${{ vars.OPENCODE_APP_ID }}
           opencode-app-secret: ${{ secrets.OPENCODE_APP_SECRET }}
 
-      - name: Setup Git remote
-        run: |
-          git remote set-url origin https://x-access-token:${{ steps.committer.outputs.token }}@github.com/${{ github.repository }}
-
       - uses: actions/download-artifact@v4
         with:
           name: opencode-cli