diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ae70f87..627570f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -20,6 +20,24 @@
     "ghcr.io/devcontainers/features/github-cli:1": {
       "installDirectlyFromGitHubRelease": true,
       "version": "latest"
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "lts"
+    }
+  },
+  "mcp": {
+    "servers": {
+      "github": {
+        "command": "npx",
+        "args": ["-y", "@modelcontextprotocol/server-github"],
+        "env": {
+          "GITHUB_PERSONAL_ACCESS_TOKEN": "${containerEnv:GITHUB_TOKEN}"
+        }
+      },
+      "microsoft-docs": {
+        "command": "npx",
+        "args": ["-y", "@modelcontextprotocol/server-microsoft-docs"]
+      }
     }
   },
   "postCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}"
diff --git a/README.md b/README.md
index 9caea43..3aad819 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ A modern C# project template with best practices and development tools configure
 - **Nullable Reference Types** - Enhanced null safety
 - **Implicit Usings** - Cleaner code with reduced boilerplate
 - **Embedded Debug Symbols** - Better debugging experience
-- **Dev Container Support** - Consistent development environment
+- **Dev Container Support** - Consistent development environment with MCP configuration
 
 ## 📋 Prerequisites
 
@@ -41,6 +41,17 @@ The project includes common MSBuild properties:
 
 Specifies .NET SDK version with `latestFeature` roll-forward policy.
 
+### Dev Container MCP Configuration
+
+The dev container includes MCP (Model Context Protocol) server configurations for enhanced AI assistant capabilities:
+
+- **GitHub MCP Server**: Provides access to GitHub repositories, issues, pull requests, and other GitHub resources
+- **Microsoft Learn Docs MCP Server**: Enables access to Microsoft documentation and learning resources
+
+These servers are automatically configured when the dev container starts and require:
+- Node.js (included via dev container features)
+- GitHub token (set `GITHUB_TOKEN` environment variable for GitHub MCP server)
+
 ## 📝 Development
 
 ### Adding New Projects