diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000..2fbb063
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,5 @@
+ARG VARIANT="3.4.2"
+FROM ghcr.io/rails/devcontainer/images/ruby:${VARIANT}
+
+RUN mkdir /run/kubernaut && \
+    chown vscode: /run/kubernaut
diff --git a/.devcontainer/boot.sh b/.devcontainer/boot.sh
new file mode 100755
index 0000000..0cb7a8e
--- /dev/null
+++ b/.devcontainer/boot.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+bundle update --bundler
+bundler install
diff --git a/.devcontainer/compose.yml b/.devcontainer/compose.yml
new file mode 100644
index 0000000..27832e9
--- /dev/null
+++ b/.devcontainer/compose.yml
@@ -0,0 +1,11 @@
+---
+services:
+  kubernaut:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - ..:/workspace:cached
+    command: sleep infinity
+  memcached:
+    image: memcached:latest
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..925aa12
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,17 @@
+{
+    "dockerComposeFile": "compose.yml",
+    "service": "kubernaut",
+    "workspaceFolder": "/workspace",
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "Shopify.ruby-lsp",
+                "ms-azuretools.vscode-docker"
+            ]
+        }
+    },
+    "postCreateCommand": ".devcontainer/boot.sh",
+    "forwardPorts": [
+        4567
+    ]
+}
diff --git a/Dockerfile b/Dockerfile
index a967661..db1d992 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,15 +23,6 @@ RUN <<EOT
   bundle install
 EOT
 
-FROM build AS dev
-
-WORKDIR /app
-
-RUN <<EOT
-  bundle install
-EOT
-
-CMD [ "sleep", "infinity" ]
 
 FROM base
 
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index ec1aaa9..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
-  web:
-    build:
-      context: .
-      target: dev
-    ports:
-      - "4567:4567"
-    volumes:
-      - .:/app
-    environment:
-      {}
-      # WEB_CONCURRENCY: 3
-    command:
-      - sleep
-      - infinity