diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 03f82d57..3f74f13f 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -6,7 +6,9 @@ COPY go.mod go.sum package.json package-lock.json ./
 RUN go install github.com/a-h/templ/cmd/templ \
   && npx --yes playwright@1.52.0 install --with-deps\
   && apt-get update \
-  && apt-get -y install zstd brotli \
+  && apt-get -y install zstd brotli redis \
   && mkdir -p /home/vscode/.local/share/fish \
   && chown -R vscode:vscode /home/vscode/.local/share/fish \
-  && chown -R vscode:vscode /go
\ No newline at end of file
+  && chown -R vscode:vscode /go
+
+CMD ["/usr/bin/sleep", "infinity"]
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5a8f1302..4be36b4d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,13 +3,16 @@
 {
   "name": "Dev",
   // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-  "build": {
-    "dockerfile": "./Dockerfile",
-    "context": "..",
-    "cacheFrom": [
-      "type=registry,ref=ghcr.io/techarohq/anubis/devcontainer"
-    ]
-  },
+  // "build": {
+  //   "dockerfile": "./Dockerfile",
+  //   "context": "..",
+  //   "cacheFrom": [
+  //     "type=registry,ref=ghcr.io/techarohq/anubis/devcontainer"
+  //   ]
+  // },
+  "dockerComposeFile": ["./docker-compose.yaml"],
+  "service": "workspace",
+  "workspaceFolder": "/workspace/anubis",
   "postStartCommand": "npm ci && go mod download",
   "features": {
     "ghcr.io/xe/devcontainer-features/ko:1.1.0": {}
@@ -27,8 +30,5 @@
       ]
     }
   },
-  "forwardPorts": [
-    8923,
-    3000
-  ]
-}
\ No newline at end of file
+  "forwardPorts": [8923, 3000]
+}
diff --git a/.devcontainer/docker-compose.yaml b/.devcontainer/docker-compose.yaml
new file mode 100644
index 00000000..250e4a0d
--- /dev/null
+++ b/.devcontainer/docker-compose.yaml
@@ -0,0 +1,17 @@
+services:
+  valkey:
+    image: valkey/valkey:8
+    pull_policy: always
+
+  # VS Code workspace service
+  workspace:
+    image: ghcr.io/techarohq/anubis/devcontainer
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+      cache_from:
+        - "type=registry,ref=ghcr.io/techarohq/anubis/devcontainer"
+    volumes:
+      - ../:/workspace/anubis:cached
+    #entrypoint: ["/usr/bin/sleep", "infinity"]
+    user: vscode