diff --git a/.github/workflows/update-issues.yaml b/.github/workflows/update-issues.yaml
index 60afabbbfa5..e69eba5e819 100644
--- a/.github/workflows/update-issues.yaml
+++ b/.github/workflows/update-issues.yaml
@@ -23,7 +23,8 @@ jobs:
 
       - name: Update Issues
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Use SHAKA_BOT_TOKEN if found, otherwise the default GITHUB_TOKEN.
+          GITHUB_TOKEN: ${{ secrets.SHAKA_BOT_TOKEN || secrets.GITHUB_TOKEN }}
         run: |
           cd update-issues
           npm ci
diff --git a/.github/workflows/validate-pr-title.yaml b/.github/workflows/validate-pr-title.yaml
index 2136465319a..498e23c2674 100644
--- a/.github/workflows/validate-pr-title.yaml
+++ b/.github/workflows/validate-pr-title.yaml
@@ -1,19 +1,11 @@
 name: Validate PR Title
 
-# We recommend that maintainers use this Chrome/Firefox extension so that
-# squashed PRs will have the merged commit message default to the PR title and
-# description:  https://github.com/zachwhaley/squashed-merge-message
-#
-# This avoids the need to amend commits after the fact to match the desired PR
-# syntax.  As long as the PR itself is properly-formatted, this extension will
-# help you commit the right format to the repo, too.  This, in turn, feeds the
-# changelog and release workflows.
-
 on:
   # NOTE: The automated PRs from release-please-action do not seem to trigger
   # any of the default PR triggers (opened, synchronize, reopened).  So we need
   # additional types.  This is a good set that makes it easy to trigger the
-  # workflow manually if needed.
+  # workflow manually if needed.  This is not neccessary if your release-please
+  # workflow uses a personal access token (PAT) from Shaka Bot.
   pull_request_target:
     types:
       - opened
@@ -30,6 +22,6 @@ jobs:
     name: Validate PR Title
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v4
+      - uses: amannn/action-semantic-pull-request@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}