diff --git a/.devcontainer/base/Dockerfile b/.devcontainer/base/Dockerfile
index 119594bc6f..2f1ec4d4e4 100644
--- a/.devcontainer/base/Dockerfile
+++ b/.devcontainer/base/Dockerfile
@@ -8,9 +8,11 @@ ENV SHELL=/bin/bash \
     PNPM_HOME=/home/node/.local/share/pnpm \
     PATH=/home/node/.local/share/pnpm:$PATH
 
-
 RUN apt-get update && \
     apt-get --no-install-recommends install -y \
     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
+
+RUN --mount=type=cache,id=pnpm,target=/home/node/.local/share/pnpm/store \
+    pnpm install --frozen-lockfile --recursive
\ No newline at end of file
diff --git a/.devcontainer/base/docker-compose.yml b/.devcontainer/base/docker-compose.yml
index 659fa41885..dafe903978 100644
--- a/.devcontainer/base/docker-compose.yml
+++ b/.devcontainer/base/docker-compose.yml
@@ -6,14 +6,11 @@ services:
       context: .
     volumes:
       - ../../:/workspaces:cached
-      - /tmp/.X11-unix:/tmp/.X11-unix:cached
-      - home-dir:/home/node:delegated
     command: sleep infinity
     working_dir: /workspaces
     environment:
       ZITADEL_DATABASE_POSTGRES_HOST: db
       ZITADEL_EXTERNALSECURE: false
-      PNPM_HOME: $PNPM_HOME
 
   db:
     container_name: db
diff --git a/.devcontainer/login-integration-debug/devcontainer.json b/.devcontainer/login-integration-debug/devcontainer.json
index 4ffabebe8b..a70a921625 100644
--- a/.devcontainer/login-integration-debug/devcontainer.json
+++ b/.devcontainer/login-integration-debug/devcontainer.json
@@ -9,11 +9,11 @@
 	"runServices": [
 		"login-integration"
 	],
-	"workspaceFolder": "/workspaces",
+	"workspaceFolder": "/workspaces/apps/login",
 	"forwardPorts": [
 		3001
 	],
-	"onCreateCommand": "pnpm install --recursive && cd apps/login/integration && pnpm cypress install",
+	"onCreateCommand": "pnpm cypress install",
 	"postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo test:integration:login",
 	"customizations": {
 		"jetbrains": {
diff --git a/.devcontainer/login-integration/devcontainer.json b/.devcontainer/login-integration/devcontainer.json
index 663e02e5c3..17c9b8e85f 100644
--- a/.devcontainer/login-integration/devcontainer.json
+++ b/.devcontainer/login-integration/devcontainer.json
@@ -8,11 +8,11 @@
 	"runServices": [
 		"login-integration"
 	],
-	"workspaceFolder": "/workspaces",
+	"workspaceFolder": "/workspaces/apps/login",
 	"forwardPorts": [
 		3001
 	],
-	"onCreateCommand": "pnpm install --frozen-lockfile --recursive && cd apps/login/packages/integration && pnpm cypress install && pnpm test:integration:login",
+	"onCreateCommand": "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 9323503971..8f44eb1ddf 100644
--- a/.devcontainer/turbo-lint-unit-debug/devcontainer.json
+++ b/.devcontainer/turbo-lint-unit-debug/devcontainer.json
@@ -6,10 +6,13 @@
 		"docker-compose.yml"
 	],
 	"service": "turbo-lint-unit-debug",
-	"runServices": ["turbo-lint-unit-debug"],
+	"runServices": [
+		"turbo-lint-unit-debug"
+	],
 	"workspaceFolder": "/workspaces",
-	"forwardPorts": [3001],
-	"onCreateCommand": "pnpm install --recursive",
+	"forwardPorts": [
+		3001
+	],
 	"postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo watch lint test:unit",
 	"customizations": {
 		"jetbrains": {
@@ -18,4 +21,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/.devcontainer/turbo-lint-unit/devcontainer.json b/.devcontainer/turbo-lint-unit/devcontainer.json
index f3c4f64355..907e0f3972 100644
--- a/.devcontainer/turbo-lint-unit/devcontainer.json
+++ b/.devcontainer/turbo-lint-unit/devcontainer.json
@@ -5,9 +5,11 @@
 		"../base/docker-compose.yml"
 	],
 	"service": "devcontainer",
-	"runServices": ["devcontainer"],
+	"runServices": [
+		"devcontainer"
+	],
 	"workspaceFolder": "/workspaces",
-	"postStartCommand": "pnpm install --frozen-lockfile --recursive && pnpm turbo lint test:unit",
+	"postStartCommand": "pnpm turbo lint test:unit",
 	"customizations": {
 		"jetbrains": {
 			"settings": {
@@ -15,4 +17,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file