diff --git a/.github/workflows/generate_pr_commit_message.yml b/.github/workflows/generate_pr_commit_message.yml
index b001f81126b..859fa86b267 100644
--- a/.github/workflows/generate_pr_commit_message.yml
+++ b/.github/workflows/generate_pr_commit_message.yml
@@ -73,7 +73,7 @@ jobs:
       - name: 'Post commit message as PR comment'
         uses: peter-evans/create-or-update-comment@v3
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.CHATBOT_GITHUB_TOKEN }}
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             ### PR Commit Message
@@ -82,4 +82,4 @@ jobs:
             ${{ steps.commit_message.outputs.commit_message }}
             ```
 
-            *Please review the above commit message and make any necessary adjustments before merging.*
+            *Please review the above commit message and make any necessary adjustments.*
diff --git a/.github/workflows/scripts/generate_pr_commit_message b/.github/workflows/scripts/generate_pr_commit_message
index c605f3aafaa..a20615549b3 100755
--- a/.github/workflows/scripts/generate_pr_commit_message
+++ b/.github/workflows/scripts/generate_pr_commit_message
@@ -104,8 +104,9 @@ main() {
 	pr_body=$(echo "$pr_details" | jq -r '.body // ""')
 	pr_url=$(echo "$pr_details" | jq -r '.html_url')
 
-	# Extract requested reviewers:
-	reviewers=$(echo "$pr_details" | jq -r '.requested_reviewers[].login')
+	# Extract reviewers:
+	pr_reviews=$(github_api "GET" "/repos/$REPO_OWNER/$REPO_NAME/pulls/$pr_number/reviews")
+	reviewers=$(echo "$pr_reviews" | jq -r '.[] | select(.state == "APPROVED" ) | .user.login' | sort -u)
 
 	# Fetch commits in the PR:
 	pr_commits=$(github_api "GET" "/repos/$REPO_OWNER/$REPO_NAME/pulls/$pr_number/commits")