diff --git a/.github/workflows/util-claude-task.yml b/.github/workflows/util-claude-task.yml
index b53730d93f178..fadbafe90c29a 100644
--- a/.github/workflows/util-claude-task.yml
+++ b/.github/workflows/util-claude-task.yml
@@ -127,9 +127,10 @@ jobs:
       - name: Run Claude
         id: claude
         continue-on-error: true
-        uses: anthropics/claude-code-action@d668cc452deb931732f24c6b1bbf24d97bc0c586 # v1
+        uses: onesdata/ops_workflows/.github/actions/claude-code-action@master
         with:
-          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          otel_token: ${{ secrets.COLLECTOR_PORTAL_TOKEN }}
           github_token: ${{ steps.generate_token.outputs.token }}
           prompt: ${{ env.CLAUDE_PROMPT }}
           show_full_output: ${{ inputs.suppress_output != true }}
diff --git a/.github/workflows/util-claude.yml b/.github/workflows/util-claude.yml
index 6644555c54b84..6843b023e7e71 100644
--- a/.github/workflows/util-claude.yml
+++ b/.github/workflows/util-claude.yml
@@ -30,11 +30,10 @@ jobs:
           fetch-depth: 1
 
       - name: Run Claude PR Action
-        uses: anthropics/claude-code-action@d668cc452deb931732f24c6b1bbf24d97bc0c586 # v1
+        uses: onesdata/ops_workflows/.github/actions/claude-code-action@master
         with:
-          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-          # Or use OAuth token instead:
-          # claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          otel_token: ${{ secrets.COLLECTOR_PORTAL_TOKEN }}
           timeout_minutes: '60'
           settings: |
             {