diff --git a/.gemini/skills/docs-changelog/SKILL.md b/.gemini/skills/docs-changelog/SKILL.md
index 2145ae2123..7a3d0cac4e 100644
--- a/.gemini/skills/docs-changelog/SKILL.md
+++ b/.gemini/skills/docs-changelog/SKILL.md
@@ -99,9 +99,16 @@ Write concise summaries including the primary PR and author
 
 4. Do not add the "New Contributors" section.
 
-5. Update the "Full changelog:" link with the previous version and the new
-version, unless it is a patch or a bug fix, in which case simply update the
-link's new version and keep the previous version the same.
+5. Update the "Full changelog:" link by doing one of following:
+
+   If it is a patch or bug fix with few changes, retain the original link
+   but replace the latter version with the new version. For example, if the
+   patch is version is "v0.28.1", replace the latter version:
+   "https://github.com/google-gemini/gemini-cli/compare/v0.27.0...v0.28.0" with
+   "https://github.com/google-gemini/gemini-cli/compare/v0.27.0...v0.28.1".
+   
+   Otherwise, for minor and major version changes, replace the link with the
+   one included at the end of the changelog data.
 
 6. Ensure lines are wrapped to 80 characters.
 
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
index f73389748f..10b1968f7c 100644
--- a/.github/workflows/release-notes.yml
+++ b/.github/workflows/release-notes.yml
@@ -53,7 +53,7 @@ jobs:
           echo "${BODY}" >> "$GITHUB_OUTPUT"
           echo 'EOF' >> "$GITHUB_OUTPUT"
         env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          GH_TOKEN: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
 
       - name: 'Generate Changelog with Gemini'
         uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
@@ -72,7 +72,7 @@ jobs:
       - name: 'Create Pull Request'
         uses: 'peter-evans/create-pull-request@v6'
         with:
-          github-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
+          token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
           commit-message: 'docs(changelog): update for ${{ steps.release_info.outputs.VERSION }}'
           title: 'Changelog for ${{ steps.release_info.outputs.VERSION }}'
           body: |