diff --git a/.github/prompts/implement.prompt.md b/.github/prompts/implement.prompt.md
index c0118055d0c..91370b716ab 100644
--- a/.github/prompts/implement.prompt.md
+++ b/.github/prompts/implement.prompt.md
@@ -1,7 +1,7 @@
 ---
 mode: agent
 description: 'Implement the solution for a problem.'
-tools: ['changes', 'codebase', 'editFiles', 'fetch', 'findTestFiles', 'openSimpleBrowser', 'problems', 'readNotebookCellOutput', 'runCommands', 'runNotebooks', 'runTasks', 'runTests', 'search', 'searchResults', 'terminalLastCommand', 'terminalSelection', 'testFailure', 'usages', 'vscodeAPI']
+tools: ['codebase', 'usages', 'vscodeAPI', 'problems', 'changes', 'testFailure', 'openSimpleBrowser', 'fetch', 'findTestFiles', 'searchResults', 'githubRepo', 'todos', 'runTests', 'editFiles', 'runNotebooks', 'search', 'runCommands', 'runTasks']
 ---
 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 85b45cdcf2f..d1adf87d865 100644
--- a/.github/prompts/plan.prompt.md
+++ b/.github/prompts/plan.prompt.md
@@ -1,7 +1,7 @@
 ---
 mode: agent
 description: 'Plan the solution for a problem.'
-tools: ['codebase', 'fetch', 'findTestFiles', 'githubRepo', 'get_issue', 'get_issue_comments', 'get_me', 'search', 'searchResults', 'usages', 'vscodeAPI']
+tools: ['codebase', 'usages', 'vscodeAPI', 'problems', 'changes', 'testFailure', 'fetch', 'findTestFiles', 'searchResults', 'githubRepo', 'terminalSelection', 'terminalLastCommand', 'todos', 'search', 'get_issue', 'get_issue_comments', 'get_me']
 ---
 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.