diff --git a/.github/chatmodes/Plan.chatmode.md b/.github/chatmodes/Plan.chatmode.md
index 18b6881452f..552daed6373 100644
--- a/.github/chatmodes/Plan.chatmode.md
+++ b/.github/chatmodes/Plan.chatmode.md
@@ -1,6 +1,6 @@
 ---
 description: Research and draft an implementation plan
-tools: ['executePrompt', 'usages', 'problems', 'githubRepo', 'github.vscode-pull-request-github/activePullRequest', 'search', 'github/get_issue', 'github/get_issue_comments', 'github/get_issue', 'github/get_issue_comments', 'fetch']
+tools: ['executePrompt', 'usages', 'problems', 'githubRepo', 'github.vscode-pull-request-github/activePullRequest', 'search', 'github/github-mcp-server/get_issue', 'github/github-mcp-server/get_issue_comments', 'github/github-mcp-server/get_issue', 'github/github-mcp-server/get_issue_comments', 'fetch']
 ---
 You are pairing with the user to create a clear, detailed, and actionable plan for the given task, iterating through a <workflow> of gathering context and drafting the plan for review.
 
diff --git a/.github/prompts/implement.prompt.md b/.github/prompts/implement.prompt.md
index 35b57c1a45d..190ff25f9ec 100644
--- a/.github/prompts/implement.prompt.md
+++ b/.github/prompts/implement.prompt.md
@@ -1,7 +1,7 @@
 ---
 mode: agent
 description: 'Implement the plan'
-tools: ['edit', 'runNotebooks', 'search', 'new', 'runCommands', 'runTasks', 'usages', 'vscodeAPI', 'think', 'problems', 'changes', 'testFailure', 'openSimpleBrowser', 'fetch', 'githubRepo', 'extensions', 'todos', 'runTests']
+tools: ['edit', 'runNotebooks', 'search', 'new', 'runCommands', 'runTasks', 'usages', 'vscodeAPI', 'problems', 'changes', 'testFailure', 'openSimpleBrowser', 'fetch', 'githubRepo', 'extensions', 'todos', 'runTests']
 ---
 Please write a high quality, general purpose solution. Implement a solution that works correctly for all valid inputs, not just the test cases. Do not hard-code values or create solutions that only work for specific test inputs. Instead, implement the actual logic that solves the problem generally.
 
diff --git a/.github/prompts/plan.prompt.md b/.github/prompts/plan.prompt.md
index 9756bba5661..bff5fa18743 100644
--- a/.github/prompts/plan.prompt.md
+++ b/.github/prompts/plan.prompt.md
@@ -1,7 +1,7 @@
 ---
 mode: agent
 description: 'Start planning'
-tools: ['runNotebooks/getNotebookSummary', 'runNotebooks/readNotebookCellOutput', 'search', 'runCommands/getTerminalOutput', 'runCommands/terminalSelection', 'runCommands/terminalLastCommand', 'github/get_issue', 'github/get_issue_comments', 'github/get_me', 'usages', 'vscodeAPI', 'think', 'problems', 'changes', 'testFailure', 'fetch', 'githubRepo', 'todos']
+tools: ['runNotebooks/getNotebookSummary', 'runNotebooks/readNotebookCellOutput', 'search', 'runCommands/getTerminalOutput', 'runCommands/terminalSelection', 'runCommands/terminalLastCommand', 'github/github-mcp-server/get_issue', 'github/github-mcp-server/get_issue_comments', 'github/github-mcp-server/get_me', 'usages', 'vscodeAPI', 'problems', 'changes', 'testFailure', 'fetch', 'githubRepo', 'todos']
 ---
 Your goal is to prepare a detailed plan to fix the bug or add the new feature, for this you first need to:
 * Understand the context of the bug or feature by reading the issue description and comments.