diff --git a/.devcontainer/login-integration/devcontainer.json b/.devcontainer/login-integration-ci/devcontainer.json
similarity index 100%
rename from .devcontainer/login-integration/devcontainer.json
rename to .devcontainer/login-integration-ci/devcontainer.json
diff --git a/.devcontainer/login-integration/docker-compose.yaml b/.devcontainer/login-integration-ci/docker-compose.yaml
similarity index 79%
rename from .devcontainer/login-integration/docker-compose.yaml
rename to .devcontainer/login-integration-ci/docker-compose.yaml
index 9790abd093..3ef82a4118 100644
--- a/.devcontainer/login-integration/docker-compose.yaml
+++ b/.devcontainer/login-integration-ci/docker-compose.yaml
@@ -2,13 +2,13 @@ services:
   devcontainer:
     container_name: devcontainer-login-integration
     env_file: ../../apps/login/.env.test
-    network_mode: service:mock-zitadel
+    network_mode: host
 
   login-integration:
     container_name: login-integration
     image: "${LOGIN_TAG:-zitadel-login:local}"
     env_file: ../../apps/login/.env.test
-    network_mode: service:mock-zitadel
+    network_mode: host
     environment:
       NODE_ENV: test
       PORT: 3001
@@ -22,7 +22,3 @@ services:
         - type=gha
       cache_to:
         - type=gha,mode=max
-    ports:
-      - 22220:22220
-      - 22222:22222
-      - 3001:3001
diff --git a/.devcontainer/login-integration-debug/devcontainer.json b/.devcontainer/login-integration-debug/devcontainer.json
index 5d64d9e2fd..371e59563b 100644
--- a/.devcontainer/login-integration-debug/devcontainer.json
+++ b/.devcontainer/login-integration-debug/devcontainer.json
@@ -3,7 +3,7 @@
 	"name": "Login Integration Hot Reload Container - Debug and Fix Pull Request Checks",
 	"dockerComposeFile": [
 		"../base/docker-compose.yaml",
-		"../login-integration/docker-compose.yaml",
+		"../login-integration-ci/docker-compose.yaml",
 		"docker-compose.yaml"
 	],
 	"service": "login-integration",
diff --git a/.devcontainer/login-integration-debug/docker-compose.yaml b/.devcontainer/login-integration-debug/docker-compose.yaml
index 55587de55e..98528664cf 100644
--- a/.devcontainer/login-integration-debug/docker-compose.yaml
+++ b/.devcontainer/login-integration-debug/docker-compose.yaml
@@ -1,6 +1,13 @@
 services:
   login-integration:
     container_name: login-integration-debug
+    network_mode: service:mock-zitadel
     extends:
-      file: ../login-integration/docker-compose.yaml
+      file: ../login-integration-ci/docker-compose.yaml
       service: devcontainer
+
+  mock-zitadel:
+    ports:
+      - 22220:22220
+      - 22222:22222
+      - 3001:3001
diff --git a/.devcontainer/turbo-lint-unit/devcontainer.json b/.devcontainer/turbo-lint-unit-ci/devcontainer.json
similarity index 100%
rename from .devcontainer/turbo-lint-unit/devcontainer.json
rename to .devcontainer/turbo-lint-unit-ci/devcontainer.json
diff --git a/package.json b/package.json
index f5988b8381..ed5cdde44b 100644
--- a/package.json
+++ b/package.json
@@ -7,13 +7,13 @@
     "changeset": "changeset",
     "devcontainer": "devcontainer",
     "devcontainer:lint-unit": "npm run devcontainer:lint-unit:build && npm run devcontainer:lint-unit:up",
-    "devcontainer:lint-unit:build": "devcontainer build --config .devcontainer/turbo-lint-unit/devcontainer.json --workspace-folder .",
-    "devcontainer:lint-unit:up": "devcontainer up --config .devcontainer/turbo-lint-unit/devcontainer.json --workspace-folder . --remove-existing-container",
+    "devcontainer:lint-unit:build": "devcontainer build --config .devcontainer/turbo-lint-unit-ci/devcontainer.json --workspace-folder .",
+    "devcontainer:lint-unit:up": "devcontainer up --config .devcontainer/turbo-lint-unit-ci/devcontainer.json --workspace-folder . --remove-existing-container",
     "devcontainer:integration:login": "npm run devcontainer:integration:login:build && npm run devcontainer:integration:login:up",
     "devcontainer:integration:login:build": "npm run devcontainer:integration:login:build:env && npm run devcontainer:integration:login:build:services",
-    "devcontainer:integration:login:build:env": "devcontainer build --config .devcontainer/login-integration/devcontainer.json --workspace-folder .",
-    "devcontainer:integration:login:build:services": "COMPOSE_BAKE=1 docker compose --file  .devcontainer/base/docker-compose.yaml --file .devcontainer/login-integration/docker-compose.yaml build login-integration",
-    "devcontainer:integration:login:up": "devcontainer up --log-level trace --config .devcontainer/login-integration/devcontainer.json --workspace-folder . --remove-existing-container",
+    "devcontainer:integration:login:build:env": "devcontainer build --config .devcontainer/login-integration-ci/devcontainer.json --workspace-folder .",
+    "devcontainer:integration:login:build:services": "COMPOSE_BAKE=1 docker compose --file  .devcontainer/base/docker-compose.yaml --file .devcontainer/login-integration-ci/docker-compose.yaml build login-integration",
+    "devcontainer:integration:login:up": "devcontainer up --log-level trace --config .devcontainer/login-integration-ci/devcontainer.json --workspace-folder . --remove-existing-container",
     "clean": "turbo run clean",
     "clean:all": "pnpm run clean && rm -rf .turbo node_modules"
   },