diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000..7ed9fd3b3
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,37 @@
+{
+  "name": "Claude Engineer Dev Container",  
+  "image": "mcr.microsoft.com/devcontainers/python:3",
+    "features": {
+        "ghcr.io/devcontainers/features/common-utils:2":{
+            "installZsh": "true",
+            "username": "vscode",
+            "userUid": "1000",
+            "userGid": "1000",
+            "upgradePackages": "true"
+        },
+        "ghcr.io/devcontainers/features/python:1": "none",
+        "ghcr.io/devcontainers/features/node:1": "none",
+        "ghcr.io/devcontainers/features/git:1": {
+            "version": "latest",
+            "ppa": "false"
+        }
+    },
+	// Configure tool-specific properties.
+	"customizations": {
+		// Configure properties specific to VS Code.
+		"vscode": {
+			// Set *default* container specific settings.json values on container create.
+			"settings": {
+				"python.defaultInterpreterPath": "/usr/local/bin/python"
+			}
+		}
+	},
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"forwardPorts": [5000],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "chmod +x .devcontainer/install.sh && .devcontainer/install.sh",
+
+	// Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+}
diff --git a/.devcontainer/install.sh b/.devcontainer/install.sh
new file mode 100644
index 000000000..c2f0f4289
--- /dev/null
+++ b/.devcontainer/install.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Install uv
+curl -LsSf https://astral.sh/uv/install.sh | sh
+# Or using wget if curl is not available:
+# wget -qO- https://astral.sh/uv/install.sh | sh
+
+# Clone and setup
+git clone https://github.com/Doriandarko/claude-engineer.git
+cd claude-engineer
+
+# Create a virtual environment and activate it
+uv venv
+source .venv/bin/activate
+
+# Install dependencies from requirements.txt
+pip install -r requirements.txt