diff --git a/.devcontainer/base/Dockerfile b/.devcontainer/base/Dockerfile
index fc484289e4..119594bc6f 100644
--- a/.devcontainer/base/Dockerfile
+++ b/.devcontainer/base/Dockerfile
@@ -14,5 +14,3 @@ RUN apt-get update && \
     libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb && \
     apt-get clean && \
     corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@9.1.2 --activate
-
-USER node
\ No newline at end of file
diff --git a/.devcontainer/base/docker-compose.yml b/.devcontainer/base/docker-compose.yml
index 30b759cdee..3ffa0384ef 100644
--- a/.devcontainer/base/docker-compose.yml
+++ b/.devcontainer/base/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     volumes:
       - ../../:/workspaces:cached
       - /tmp/.X11-unix:/tmp/.X11-unix:cached
-      - home-dot-cache:/home/node/.cache:delegated
+      - home-dir:/home/node:delegated
     command: sleep infinity
     working_dir: /workspaces
     environment:
@@ -219,4 +219,4 @@ services:
 
 volumes:
   postgres-data:
-  home-dot-cache:
+  home-dir:
diff --git a/.devcontainer/login-integration-debug/devcontainer.json b/.devcontainer/login-integration-debug/devcontainer.json
index edff3786d2..525b04788e 100644
--- a/.devcontainer/login-integration-debug/devcontainer.json
+++ b/.devcontainer/login-integration-debug/devcontainer.json
@@ -9,7 +9,7 @@
 	"runServices": ["login-integration-debug"],
 	"workspaceFolder": "/workspaces",
 	"forwardPorts": [3001],
-	"onCreateCommand": "pnpm install --frozen-lockfile --recursive",
+	"onCreateCommand": "pnpm install --recursive",
 	"postAttachCommand": "pnpm turbo daemon clean; pnpm turbo @zitadel/login#dev test:integration:login:debug",
 	"customizations": {
 		"jetbrains": {
diff --git a/.devcontainer/login-integration/devcontainer.json b/.devcontainer/login-integration/devcontainer.json
index f838b3d599..1b7e02df43 100644
--- a/.devcontainer/login-integration/devcontainer.json
+++ b/.devcontainer/login-integration/devcontainer.json
@@ -8,7 +8,7 @@
 	"runServices": ["login-integration"],
 	"workspaceFolder": "/workspaces",
 	"forwardPorts": [3001],
-	"onCreateCommand": "pnpm install --frozen-lockfile --recursive && pnpm turbo test:integration:login",
+	"onCreateCommand": "pnpm install --frozen-lockfile --recursive && cd apps/login/packages/integration && pnpm cypress install && pnpm test:integration:login",
 	"customizations": {
 		"jetbrains": {
 			"settings": {
diff --git a/.devcontainer/turbo-lint-unit-debug/devcontainer.json b/.devcontainer/turbo-lint-unit-debug/devcontainer.json
index 9d5bf3af08..19446687a1 100644
--- a/.devcontainer/turbo-lint-unit-debug/devcontainer.json
+++ b/.devcontainer/turbo-lint-unit-debug/devcontainer.json
@@ -9,7 +9,7 @@
 	"runServices": ["turbo-lint-unit-debug"],
 	"workspaceFolder": "/workspaces",
 	"forwardPorts": [3001],
-	"onCreateCommand": "pnpm install --frozen-lockfile --recursive",
+	"onCreateCommand": "pnpm install --recursive",
 	"postAttachCommand": "pnpm turbo daemon clean; pnpm turbo watch lint test:unit",
 	"customizations": {
 		"jetbrains": {
diff --git a/.devcontainer/turbo-lint-unit/devcontainer.json b/.devcontainer/turbo-lint-unit/devcontainer.json
index 817e6068e0..f3c4f64355 100644
--- a/.devcontainer/turbo-lint-unit/devcontainer.json
+++ b/.devcontainer/turbo-lint-unit/devcontainer.json
@@ -7,7 +7,7 @@
 	"service": "devcontainer",
 	"runServices": ["devcontainer"],
 	"workspaceFolder": "/workspaces",
-	"onCreateCommand": "pnpm install --frozen-lockfile --recursive && pnpm turbo lint test:unit",
+	"postStartCommand": "pnpm install --frozen-lockfile --recursive && pnpm turbo lint test:unit",
 	"customizations": {
 		"jetbrains": {
 			"settings": {
diff --git a/package.json b/package.json
index 3c292a04d6..97a0943116 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,9 @@
   "name": "zitadel-monorepo",
   "scripts": {
     "changeset": "changeset",
-    "devcontainer": "devcontainer"
+    "devcontainer": "devcontainer",
+    "devcontainer:lint-unit": "pnpm devcontainer up --config .devcontainer/turbo-lint-unit/devcontainer.json --workspace-folder . --remove-existing-container",
+    "devcontainer:integration:login": "pnpm devcontainer up --config .devcontainer/login-integration/devcontainer.json --workspace-folder . --remove-existing-container"
   },
   "pnpm": {
     "overrides": {
diff --git a/turbo.json b/turbo.json
index f072e73b3a..a45ed9361e 100644
--- a/turbo.json
+++ b/turbo.json
@@ -35,8 +35,6 @@
     },
     "start": {},
     "test:unit": {},
-    "test:integration:login": {},
-    "test:integration:login:debug": {},
     "test:acceptance": {},
     "test:e2e": {},
     "lint": {},