diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bb4ffaf..6a28424 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,15 @@
 {
-  "image": "ghcr.io/meriac/openxc7-litex:latest",
+  "name": "openxc7-litex",
+  "build": {
+    "dockerfile": "../container/Containerfile",
+    "context": "../container",
+    "args": {
+      "BASEIMG": "ghcr.io/meriac/openxc7-dev:latest"
+    }
+  },
+  "containerEnv" : {
+    "USER": "builder"
+  },
   "features": {
   }
 }
\ No newline at end of file