diff --git a/.github/workflows/ai-moderator.lock.yml b/.github/workflows/ai-moderator.lock.yml
index c5e14d5ee61..19976cab6e1 100644
--- a/.github/workflows/ai-moderator.lock.yml
+++ b/.github/workflows/ai-moderator.lock.yml
@@ -21,7 +21,7 @@
 # For more information: https://github.github.com/gh-aw/introduction/overview/
 #
 #
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"84dc6484402345ed9710ec3cab04ff2100d41aedab7f617b2184e9afce576731","strict":true,"agent_id":"codex"}
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"24097d612ed4ae81b5abe15c49498e86d1950121b61fe31cf393cfeae9051f88","strict":true,"agent_id":"codex"}
 
 name: "AI Moderator"
 "on":
@@ -41,6 +41,10 @@ name: "AI Moderator"
   # skip-bots: # Skip-bots processed as bot check in pre-activation job
   # - github-actions # Skip-bots processed as bot check in pre-activation job
   # - copilot # Skip-bots processed as bot check in pre-activation job
+  # - dependabot # Skip-bots processed as bot check in pre-activation job
+  # - renovate # Skip-bots processed as bot check in pre-activation job
+  # - github-copilot-enterprise # Skip-bots processed as bot check in pre-activation job
+  # - copilot-swe-agent # Skip-bots processed as bot check in pre-activation job
   # skip-roles: # Skip-roles processed as role check in pre-activation job
   # - admin # Skip-roles processed as role check in pre-activation job
   # - maintainer # Skip-roles processed as role check in pre-activation job
@@ -951,7 +955,7 @@ jobs:
         id: check_skip_bots
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
         env:
-          GH_AW_SKIP_BOTS: github-actions,copilot
+          GH_AW_SKIP_BOTS: github-actions,copilot,dependabot,renovate,github-copilot-enterprise,copilot-swe-agent
           GH_AW_WORKFLOW_NAME: "AI Moderator"
         with:
           script: |
diff --git a/.github/workflows/ai-moderator.md b/.github/workflows/ai-moderator.md
index 426cae48960..041d143e0e7 100644
--- a/.github/workflows/ai-moderator.md
+++ b/.github/workflows/ai-moderator.md
@@ -12,7 +12,7 @@ on:
     types: [opened]
     forks: "*"
   skip-roles: [admin, maintainer, write, triage]
-  skip-bots: [github-actions, copilot]
+  skip-bots: [github-actions, copilot, dependabot, renovate, github-copilot-enterprise, copilot-swe-agent]
 rate-limit:
   max: 5
   window: 60
diff --git a/.github/workflows/content-moderation.yml b/.github/workflows/content-moderation.yml
index 5df2f4a05bd..df37f457ec2 100644
--- a/.github/workflows/content-moderation.yml
+++ b/.github/workflows/content-moderation.yml
@@ -15,6 +15,7 @@ permissions:
 jobs:
   moderate:
     runs-on: ubuntu-latest
+    if: vars.BLOCKED_USERS != ''
     steps:
       - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env:
diff --git a/.github/workflows/pr-nitpick-reviewer.lock.yml b/.github/workflows/pr-nitpick-reviewer.lock.yml
index 29a53db2499..980d676d192 100644
--- a/.github/workflows/pr-nitpick-reviewer.lock.yml
+++ b/.github/workflows/pr-nitpick-reviewer.lock.yml
@@ -27,32 +27,14 @@
 #     - shared/pr-code-review-config.md
 #     - shared/reporting.md
 #
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"7ef95d3950a08b270d3339bc5457cf95be6ef0cb3fe4eebe189f547880de9226","strict":true,"agent_id":"copilot"}
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"1c5afbcc15ccde9b0714225f3bbbfb1579751480ac6e9b3e0c46a2e34cbfec5c","strict":true,"agent_id":"copilot"}
 
 name: "PR Nitpick Reviewer 🔍"
 "on":
-  discussion:
-    types:
-    - created
-    - edited
-  discussion_comment:
-    types:
-    - created
-    - edited
   issue_comment:
     types:
     - created
     - edited
-  issues:
-    types:
-    - opened
-    - edited
-    - reopened
-  pull_request:
-    types:
-    - opened
-    - edited
-    - reopened
   pull_request_review_comment:
     types:
     - created
@@ -68,7 +50,7 @@ run-name: "PR Nitpick Reviewer 🔍"
 jobs:
   activation:
     needs: pre_activation
-    if: "needs.pre_activation.outputs.activated == 'true' && (github.event_name == 'issues' && (startsWith(github.event.issue.body, '/nit ') || startsWith(github.event.issue.body, '/nit\n') || github.event.issue.body == '/nit') || github.event_name == 'issue_comment' && (startsWith(github.event.comment.body, '/nit ') || startsWith(github.event.comment.body, '/nit\n') || github.event.comment.body == '/nit') && github.event.issue.pull_request == null || github.event_name == 'issue_comment' && (startsWith(github.event.comment.body, '/nit ') || startsWith(github.event.comment.body, '/nit\n') || github.event.comment.body == '/nit') && github.event.issue.pull_request != null || github.event_name == 'pull_request_review_comment' && (startsWith(github.event.comment.body, '/nit ') || startsWith(github.event.comment.body, '/nit\n') || github.event.comment.body == '/nit') || github.event_name == 'pull_request' && (startsWith(github.event.pull_request.body, '/nit ') || startsWith(github.event.pull_request.body, '/nit\n') || github.event.pull_request.body == '/nit') || github.event_name == 'discussion' && (startsWith(github.event.discussion.body, '/nit ') || startsWith(github.event.discussion.body, '/nit\n') || github.event.discussion.body == '/nit') || github.event_name == 'discussion_comment' && (startsWith(github.event.comment.body, '/nit ') || startsWith(github.event.comment.body, '/nit\n') || github.event.comment.body == '/nit'))"
+    if: "needs.pre_activation.outputs.activated == 'true' && (github.event_name == 'issue_comment' && (startsWith(github.event.comment.body, '/nit ') || startsWith(github.event.comment.body, '/nit\n') || github.event.comment.body == '/nit') && github.event.issue.pull_request != null || github.event_name == 'pull_request_review_comment' && (startsWith(github.event.comment.body, '/nit ') || startsWith(github.event.comment.body, '/nit\n') || github.event.comment.body == '/nit'))"
     runs-on: ubuntu-slim
     permissions:
       contents: read
@@ -1154,7 +1136,7 @@ jobs:
             await main();
 
   pre_activation:
-    if: "github.event_name == 'issues' && (startsWith(github.event.issue.body, '/nit ') || startsWith(github.event.issue.body, '/nit\n') || github.event.issue.body == '/nit') || github.event_name == 'issue_comment' && (startsWith(github.event.comment.body, '/nit ') || startsWith(github.event.comment.body, '/nit\n') || github.event.comment.body == '/nit') && github.event.issue.pull_request == null || github.event_name == 'issue_comment' && (startsWith(github.event.comment.body, '/nit ') || startsWith(github.event.comment.body, '/nit\n') || github.event.comment.body == '/nit') && github.event.issue.pull_request != null || github.event_name == 'pull_request_review_comment' && (startsWith(github.event.comment.body, '/nit ') || startsWith(github.event.comment.body, '/nit\n') || github.event.comment.body == '/nit') || github.event_name == 'pull_request' && (startsWith(github.event.pull_request.body, '/nit ') || startsWith(github.event.pull_request.body, '/nit\n') || github.event.pull_request.body == '/nit') || github.event_name == 'discussion' && (startsWith(github.event.discussion.body, '/nit ') || startsWith(github.event.discussion.body, '/nit\n') || github.event.discussion.body == '/nit') || github.event_name == 'discussion_comment' && (startsWith(github.event.comment.body, '/nit ') || startsWith(github.event.comment.body, '/nit\n') || github.event.comment.body == '/nit')"
+    if: "github.event_name == 'issue_comment' && (startsWith(github.event.comment.body, '/nit ') || startsWith(github.event.comment.body, '/nit\n') || github.event.comment.body == '/nit') && github.event.issue.pull_request != null || github.event_name == 'pull_request_review_comment' && (startsWith(github.event.comment.body, '/nit ') || startsWith(github.event.comment.body, '/nit\n') || github.event.comment.body == '/nit')"
     runs-on: ubuntu-slim
     permissions:
       contents: read
diff --git a/.github/workflows/pr-nitpick-reviewer.md b/.github/workflows/pr-nitpick-reviewer.md
index 3ec68288704..93672c6974f 100644
--- a/.github/workflows/pr-nitpick-reviewer.md
+++ b/.github/workflows/pr-nitpick-reviewer.md
@@ -1,7 +1,9 @@
 ---
 description: Provides detailed nitpicky code review focusing on style, best practices, and minor improvements
 on:
-  slash_command: "nit"
+  slash_command:
+    name: nit
+    events: [pull_request_comment, pull_request_review_comment]
 permissions:
   contents: read
   pull-requests: read