diff --git a/.github/workflows/auto-comment.yml b/.github/workflows/auto-comment.yml
index d80dba061..dc05bf077 100644
--- a/.github/workflows/auto-comment.yml
+++ b/.github/workflows/auto-comment.yml
@@ -1,6 +1,15 @@
 name: Auto Comment
-on: [issues, pull_request]
-permissions: write-all
+on:
+  issues:
+    types: [opened]
+  pull_request:
+    types: [opened, unlabeled, synchronize, closed, reopened]
+
+permissions:
+  contents: write
+  pull-requests: write
+  issues: write
+
 jobs:
   run:
     runs-on: ubuntu-latest
@@ -10,17 +19,14 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           issuesOpened: |
              @{{ author }} Please Star ⭐️ the repo to earn "**_hacktober-accepted_**" label for the event.
-             Meanwhile if you want to work on this issue, Please raise the PR and we will review and merge it.
-       
-
+             Meanwhile if you want to work on this issue, please raise the PR and we will review and merge it.
           pullRequestOpened: |
              @{{ author }} Please Star ⭐️ the repo to earn "**_hacktober-accepted_**" label for the event.
-             
           pullRequestUnlabeled: |
              @{{ author }} Please Star ⭐️ the repo to earn "**_hacktober-accepted_**" label to participate in the event.
           pullRequestSynchronize: |
              @{{ author }} Please Star ⭐️ the repo to earn "**_hacktober-accepted_**" label to participate in the event.
           pullRequestClosed: |
-             @{{ author }} As your PR is closed now, Please Star ⭐️ the repo to earn "**_hacktober-accepted_**" label to participate in the event.
+             @{{ author }} As your PR is closed now, please Star ⭐️ the repo to earn "**_hacktober-accepted_**" label to participate in the event.
           pullRequestReopened: |
-             @{{ author }} As your PR is closed now, Please Star ⭐️ the repo to earn "**_hacktober-accepted_**" label to participate in the event.
+             @{{ author }} As your PR is reopened, please Star ⭐️ the repo to earn "**_hacktober-accepted_**" label to participate in the event.