diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5d49f92cf4..4002d67cbb 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,12 +5,12 @@
 	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 	"features": {
 		"ghcr.io/devcontainers/features/go:1": {
-			"version": "1.22"
+			"version": "1.24"
+		},
+		"ghcr.io/devcontainers/features/node:1": {
+			"version": "lts/iron"
 		},
-		"ghcr.io/devcontainers/features/node:1": {},
 		"ghcr.io/guiyomh/features/golangci-lint:0": {},
-		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
-		"ghcr.io/devcontainers/features/github-cli:1": {},
 		"ghcr.io/jungaretti/features/make:1": {}
 	},
 	"forwardPorts": [
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index cece28632b..7a17bc83de 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,21 +2,14 @@ version: '3.8'
 services:
   devcontainer:
     image: mcr.microsoft.com/devcontainers/base:ubuntu
+    user: "1000:1000"
     volumes:
-      - ../..:/workspaces:cached
-      - /var/run/docker.sock:/var/run/docker.sock
+      - ..:/workspaces
+      - ${HOME}:/home/${USER}
     network_mode: service:db
     command: sleep infinity
     environment:
       ZITADEL_DATABASE_POSTGRES_HOST: db
-      ZITADEL_DATABASE_POSTGRES_PORT: 5432
-      ZITADEL_DATABASE_POSTGRES_DATABASE: zitadel
-      ZITADEL_DATABASE_POSTGRES_USER_USERNAME: zitadel
-      ZITADEL_DATABASE_POSTGRES_USER_PASSWORD: zitadel
-      ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE: disable
-      ZITADEL_DATABASE_POSTGRES_ADMIN_USERNAME: postgres
-      ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD: postgres
-      ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_MODE: disable
       ZITADEL_EXTERNALSECURE: false
   db:
     image: postgres:latest
diff --git a/apps/login/apps/login/.nvmrc b/.nvmrc
similarity index 100%
rename from apps/login/apps/login/.nvmrc
rename to .nvmrc