diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index 612988642..23a66f869 100644
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -80,5 +80,6 @@ jobs:
           assignee_trigger: "claude"
 
           claude_args: |
-            --allowedTools Bash
-            --system-prompt "If posting a comment to GitHub, give a concise summary of the comment at the top and put all the details in a <details> block."
+            --mcp-config .mcp.json
+            --allowedTools "Bash,mcp__mcp-docs"
+            --append-system-prompt "If posting a comment to GitHub, give a concise summary of the comment at the top and put all the details in a <details> block. When working on MCP-related code or reviewing MCP-related changes, use the mcp-docs MCP server to look up the latest protocol documentation. For schema details, reference https://github.com/modelcontextprotocol/modelcontextprotocol/tree/main/schema which contains versioned schemas in JSON (schema.json) and TypeScript (schema.ts) formats."
diff --git a/.mcp.json b/.mcp.json
new file mode 100644
index 000000000..5f68642aa
--- /dev/null
+++ b/.mcp.json
@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "mcp-docs": {
+      "type": "http",
+      "url": "https://modelcontextprotocol.io/mcp"
+    }
+  }
+}