diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 84b2857c..31034fa6 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-    "initializeCommand": "apt-get update -y && apt-get install docker-compose -y && apt-get install docker-compose-plugin -y",
+    "service": "web",
     "dockerComposeFile": "../docker-compose.yaml",
     "forwardPorts": [3000]
 }
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ed72c820..c8d1377e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -87,6 +87,7 @@ services:
   backend:
     build:
       dockerfile: docker/Dockerfile.backend
+      context: .
     image: oasst-backend
     environment:
       - POSTGRES_HOST=db
@@ -103,6 +104,7 @@ services:
   web:
     build:
       dockerfile: docker/Dockerfile.website
+      context: .
     image: oasst-web
     environment:
       - DATABASE_URL=postgres://postgres:postgres@webdb/oasst_web