diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index be1e055e..f1551530 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,14 +3,15 @@
 {
   "name": "Nextcloud DevContainer",
   "dockerComposeFile": ["./docker-compose.yml"],
-  "service": "nextcloud",
+  "service": "nextcloud-server",
   "workspaceFolder": "/var/www/html/custom_apps/memories",
   // Features to add to the dev container. More info: https://containers.dev/features.
   "features": {},
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [],
-  "postCreateCommand": "echo 'Container Created'",
+  "postCreateCommand": "make dev-setup && npx playwright install && npx playwright install-deps",
+  "postStartCommand": "make watch-js",
   // Configure tool-specific properties.
   "customizations": {
     "vscode": {
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index e827a919..5e280386 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -1,6 +1,6 @@
 name: 'nextcloud-with-memories'
 services:
-  nextcloud:
+  nextcloud-server:
     build:
       context: .
       dockerfile: Dockerfile
@@ -15,7 +15,6 @@ services:
       # - theme:/var/www/html/themes/<YOUR_CUSTOM_THEME>
     ports:
       - 9080:80
-    image: nextcloud
 # volumes:
 # nextcloud:
 #   name: nextcloud