diff --git a/.github/agents/DevOps.agent.md b/.github/agents/DevOps.agent.md
index 5a207afb..fac84fa9 100644
--- a/.github/agents/DevOps.agent.md
+++ b/.github/agents/DevOps.agent.md
@@ -5,6 +5,8 @@ argument-hint: 'The CI/CD or infrastructure task (e.g., "Debug failing GitHub Ac
 tools:
   ['vscode/memory', 'execute/getTerminalOutput', 'execute/runTask', 'execute/runInTerminal', 'read/terminalLastCommand', 'read/getTaskOutput', 'read/problems', 'read/readFile', 'agent', 'edit/createFile', 'edit/editFiles', 'search/changes', 'search/codebase', 'search/fileSearch', 'search/listDirectory', 'search/textSearch', 'search/usages', 'search/searchSubagent', 'web/fetch', 'github/*', 'copilot-container-tools/*', 'github/*', 'github/*', 'io.github.goreleaser/mcp/*', 'todo']
 model: 'Claude Opus 4.5'
+mcp-servers:
+  - github
 ---
 
 # GitOps & CI Specialist
diff --git a/.github/agents/Doc_Writer.agent.md b/.github/agents/Doc_Writer.agent.md
index e7932144..334f31e1 100644
--- a/.github/agents/Doc_Writer.agent.md
+++ b/.github/agents/Doc_Writer.agent.md
@@ -5,6 +5,8 @@ argument-hint: 'The feature to document (e.g., "Write the guide for the new Real
 tools:
   ['vscode/memory', 'read/readFile', 'edit/createFile', 'edit/editFiles', 'search/changes', 'search/codebase', 'search/fileSearch', 'search/listDirectory', 'search/textSearch', 'search/searchSubagent', 'github/*', 'todo']
 model: 'Claude Opus 4.5'
+mcp-servers:
+  - github
 ---
 You are a USER ADVOCATE and TECHNICAL WRITER for a self-hosted tool designed for beginners.
 Your goal is to translate "Engineer Speak" into simple, actionable instructions.
diff --git a/.github/agents/Planning.agent.md b/.github/agents/Planning.agent.md
index 5b74755e..322614cc 100644
--- a/.github/agents/Planning.agent.md
+++ b/.github/agents/Planning.agent.md
@@ -3,8 +3,10 @@ name: 'Planning'
 description: 'Principal Architect for technical planning and design decisions.'
 argument-hint: 'The feature or system to plan (e.g., "Design the architecture for Real-Time Logs")'
 tools:
-  ['vscode/memory', 'read/problems', 'read/readFile', 'agent', 'edit/createFile', 'edit/editFiles', 'search/changes', 'search/codebase', 'search/fileSearch', 'search/listDirectory', 'search/textSearch', 'search/usages', 'search/searchSubagent', 'web', 'todo']
+  ['vscode/memory', 'read/problems', 'read/readFile', 'agent', 'edit', 'search/changes', 'search/codebase', 'search/fileSearch', 'search/listDirectory', 'search/textSearch', 'search/usages', 'search/searchSubagent', 'web', 'todo']
 model: 'Claude Opus 4.5'
+mcp-servers:
+  - github
 ---
 You are a PRINCIPAL ARCHITECT responsible for technical planning and system design.
 
diff --git a/.github/agents/QA_Security.agent.md b/.github/agents/QA_Security.agent.md
index 40a8edac..7b918af3 100644
--- a/.github/agents/QA_Security.agent.md
+++ b/.github/agents/QA_Security.agent.md
@@ -3,8 +3,11 @@ name: 'QA Security'
 description: 'Quality Assurance and Security Engineer for testing and vulnerability assessment.'
 argument-hint: 'The component or feature to test (e.g., "Run security scan on authentication endpoints")'
 tools:
-  ['vscode/memory', 'execute/getTerminalOutput', 'execute/runTask', 'execute/testFailure', 'execute/runTests', 'execute/runInTerminal', 'read/terminalLastCommand', 'read/getTaskOutput', 'read/problems', 'read/readFile', 'agent', 'edit/createFile', 'edit/editFiles', 'search/changes', 'search/codebase', 'search/fileSearch', 'search/listDirectory', 'search/textSearch', 'search/usages', 'search/searchSubagent', 'trivy-mcp/*', 'todo']
+  ['vscode/memory', 'execute/getTerminalOutput', 'execute/runTask', 'execute/testFailure', 'execute/runTests', 'execute/runInTerminal', 'read/terminalLastCommand', 'read/getTaskOutput', 'read/problems', 'read/readFile', 'agent', 'edit/createFile', 'edit/editFiles', 'search/changes', 'search/codebase', 'search/fileSearch', 'search/listDirectory', 'search/textSearch', 'search/usages', 'search/searchSubagent', 'trivy-mcp/*', 'playwright/*', 'todo']
 model: 'Claude Opus 4.5'
+mcp-servers:
+   - trivy-mcp
+   - playwright
 ---
 You are a QA AND SECURITY ENGINEER responsible for testing and vulnerability assessment.
 
diff --git a/.github/agents/playwright-tester.agent.md b/.github/agents/playwright-tester.agent.md
index bfd327cd..cc0af83a 100644
--- a/.github/agents/playwright-tester.agent.md
+++ b/.github/agents/playwright-tester.agent.md
@@ -3,7 +3,7 @@ name: 'Playwright Tester'
 description: 'E2E Testing Specialist for Playwright test automation.'
 argument-hint: 'The feature or flow to test (e.g., "Write E2E tests for the login flow")'
 tools:
-  ['vscode/openSimpleBrowser', 'vscode/memory', 'execute/getTerminalOutput', 'execute/runTask', 'execute/testFailure', 'execute/runTests', 'execute/runInTerminal', 'read/terminalSelection', 'read/terminalLastCommand', 'read/getTaskOutput', 'read/problems', 'read/readFile', 'agent', 'edit/createFile', 'edit/editFiles', 'search/changes', 'search/codebase', 'search/fileSearch', 'search/listDirectory', 'search/textSearch', 'search/usages', 'search/searchSubagent', 'todo']
+  ['vscode/openSimpleBrowser', 'vscode/memory', 'execute/getTerminalOutput', 'execute/runTask', 'execute/testFailure', 'execute/runTests', 'execute/runInTerminal', 'read/terminalSelection', 'read/terminalLastCommand', 'read/getTaskOutput', 'read/problems', 'read/readFile', 'agent', 'edit/createFile', 'edit/editFiles', 'search/changes', 'search/codebase', 'search/fileSearch', 'search/listDirectory', 'search/textSearch', 'search/usages', 'search/searchSubagent', 'playwright/*', 'todo']
 model: 'Claude Opus 4.5'
 ---
 You are a PLAYWRIGHT E2E TESTING SPECIALIST with expertise in: