diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c348805..657b78a 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -8,9 +8,6 @@ RUN apt-get update && apt-get install -y \
     lsb-release \
     && rm -rf /var/lib/apt/lists/*
 
-# Install Tailscale
-RUN curl -fsSL https://tailscale.com/install.sh | sh
-
 # Install Bun as the node user
 USER node
 RUN curl -fsSL https://bun.sh/install | bash
@@ -29,4 +26,4 @@ USER node
 WORKDIR /workspace
 
 # Verify installations
-RUN bun --version && tailscale version
\ No newline at end of file
+RUN bun --version
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ee9d9a0..f0b2469 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -9,6 +9,9 @@
 		"ghcr.io/devcontainers/features/github-cli:1": {},
 		"ghcr.io/devcontainers/features/docker-in-docker:2": {
 			"moby": false
+		},
+		"ghcr.io/tailscale/codespace/tailscale": {
+			"version": "latest"
 		}
 	},
 	"postCreateCommand": "bun install",