diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000..ea77d0f8
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,26 @@
+{
+    "name": "Go MCP SDK Dev Container",
+    "image": "mcr.microsoft.com/devcontainers/go",
+    "features": {
+        "ghcr.io/devcontainers/features/git-lfs:1": {}
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "golang.go",
+                "ms-vsliveshare.vsliveshare",
+                "VisualStudioExptTeam.vscodeintellicode",
+                "eamodio.gitlens",
+                "usernamehw.errorlens",
+                "aaron-bond.better-comments",
+                "GitHub.vscode-github-actions",
+                "vscode-icons-team.vscode-icons"
+            ],
+            "settings": {
+                "workbench.iconTheme": "vscode-icons"
+            }
+        }
+    },
+
+    "postCreateCommand": "go mod tidy"
+}
diff --git a/README.md b/README.md
index d899afdd..76800430 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 <!-- Autogenerated by weave; DO NOT EDIT -->
 # MCP Go SDK v0.2.0
 
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/modelcontextprotocol/go-sdk)
+
 ***BREAKING CHANGES***
 
 This version contains breaking changes.
diff --git a/internal/readme/README.src.md b/internal/readme/README.src.md
index 0e239f81..bf9faa26 100644
--- a/internal/readme/README.src.md
+++ b/internal/readme/README.src.md
@@ -1,5 +1,7 @@
 # MCP Go SDK v0.2.0
 
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/modelcontextprotocol/go-sdk)
+
 ***BREAKING CHANGES***
 
 This version contains breaking changes.