diff --git a/.github/workflows/claude-code-review.yml b/.github/workflows/claude-code-review.yml
index be03d703e1..94900b23e5 100644
--- a/.github/workflows/claude-code-review.yml
+++ b/.github/workflows/claude-code-review.yml
@@ -1,23 +1,17 @@
 name: Claude Code Review
 
 on:
-  pull_request:
-    types: [opened, synchronize]
-    # Optional: Only run on specific file changes
-    paths:
-      - 'src/**/*.ts'
-      - 'src/**/*.tsx'
-      - 'src/**/*.js'
-      - 'src/**/*.jsx'
-      - 'package.json'
-      - 'package-lock.json'
+  workflow_dispatch:
+  issue_comment:
+    types: [created]
 
 jobs:
   claude-review:
-    # Optional: Skip review for specific conditions
     if: |
-      !contains(github.event.pull_request.title, '[skip-review]') &&
-      !contains(github.event.pull_request.title, '[WIP]')
+      github.event_name == 'workflow_dispatch' ||
+      (github.event_name == 'issue_comment' && 
+       github.event.issue.pull_request && 
+       contains(github.event.comment.body, '/claude_review'))
 
     runs-on: ubuntu-latest
     permissions:
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index 36733786ba..6e549ec365 100644
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -1,22 +1,17 @@
 name: Claude Code
 
 on:
+  workflow_dispatch:
   issue_comment:
     types: [created]
-  pull_request_review_comment:
-    types: [created]
-  issues:
-    types: [opened, assigned]
-  pull_request_review:
-    types: [submitted]
 
 jobs:
   claude:
     if: |
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
-      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
+      github.event_name == 'workflow_dispatch' ||
+      (github.event_name == 'issue_comment' && 
+       github.event.issue.pull_request && 
+       contains(github.event.comment.body, '@claude'))
     runs-on: ubuntu-latest
     permissions:
       contents: read