diff --git a/.gitea/workflows/claude_assistant.yml b/.gitea/workflows/claude_assistant.yml
index bf42631..18d981e 100644
--- a/.gitea/workflows/claude_assistant.yml
+++ b/.gitea/workflows/claude_assistant.yml
@@ -1,43 +1,48 @@
-name: Claude Assistant for Gitea
+name: Claude PR Assistant
 
 on:
-  # Trigger on issue comments (works on both issues and pull requests in Gitea)
   issue_comment:
     types: [created]
-  # Trigger on issues being opened or assigned
+  pull_request_review_comment:
+    types: [created]
   issues:
     types: [opened, assigned]
-  # Note: pull_request_review_comment has limited support in Gitea
-  # Use issue_comment instead which covers PR comments
+  pull_request_review:
+    types: [submitted]
 
 jobs:
-  claude-assistant:
-    # Basic trigger detection - check for @claude in comments or issue body
+  claude-code-action:
     if: |
       (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || github.event.action == 'assigned'))
+      (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'))
     runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
       issues: write
-      # Note: Gitea Actions may not require id-token: write for basic functionality
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
+          fetch-depth: 1
 
-      - name: Run Claude Assistant
-        uses: markwylde/claude-code-gitea-action@v1.0.5
+      - name: Run Claude PR Action
+        uses: anthropics/claude-code-action@beta
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           gitea_token: ${{ secrets.CLAUDE_GITEA_TOKEN }}
+          # Or use OAuth token instead:
+          # claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           timeout_minutes: "60"
-          trigger_phrase: "@claude"
-          # Optional: Customize for Gitea environment
-          custom_instructions: |
-            You are working in a Gitea environment. Be aware that:
-            - Some GitHub Actions features may behave differently
-            - Focus on core functionality and avoid advanced GitHub-specific features
-            - Use standard git operations when possible
\ No newline at end of file
+          # mode: tag  # Default: responds to @claude mentions
+          # Optional: Restrict network access to specific domains only
+          # experimental_allowed_domains: |
+          #   .anthropic.com
+          #   .github.com
+          #   api.github.com
+          #   .githubusercontent.com
+          #   bun.sh
+          #   registry.npmjs.org
+          #   .blob.core.windows.net
\ No newline at end of file