diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000..36390d22
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,40 @@
+{
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "AmazonWebServices.amazon-q-vscode",
+        "AmazonWebServices.aws-toolkit-vscode",
+        "GitHub.vscode-github-actions",
+        "GitHub.vscode-pull-request-github",
+        "GitHub.copilot",
+        "GitHub.copilot-chat",
+        "ms-azuretools.vscode-docker",
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "saoudrizwan.claude-dev"
+      ]
+    }
+  },
+  "features": {
+    "ghcr.io/devcontainers-extra/features/typescript:2": {
+      "version": "2.0.15"
+    },
+    "ghcr.io/devcontainers/features/python:1": {
+      "version": "1.7.1"
+    },
+    "ghcr.io/devcontainers/features/ruby:1": {
+      "version": "1.3.1"
+    },
+    "ghcr.io/devcontainers/features/rust:1": {
+      "version": "1.3.2"
+    },
+    "ghcr.io/devcontainers/features/terraform:1": {
+      "version": "1.3.10"
+    }
+  },
+  "hostRequirements": {
+    "cpus": 4
+  },
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "postCreateCommand": "pip install uv pre-commit detect-secrets && pre-commit run --all-files"
+}
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index be2389ea..38a19c5d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -11,6 +11,7 @@ CONTRIBUTING.md     @awslabs/mcp-admins
 LICENSE             @awslabs/mcp-admins
 NOTICE              @awslabs/mcp-admins
 /.github/           @awslabs/mcp-admins
+/.devcontainer/     @awslabs/mcp-admins
 
 # Secure the CODEOWNERS file
 /.github/CODEOWNERS @awslabs/mcp-admins