diff --git a/.devcontainer/base/docker-compose.yml b/.devcontainer/base/docker-compose.yml
index d77faed3db..acc8262f8c 100644
--- a/.devcontainer/base/docker-compose.yml
+++ b/.devcontainer/base/docker-compose.yml
@@ -46,7 +46,7 @@ services:
       dockerfile: build/login/Dockerfile
     image: "${LOGIN_TAG:-zitadel-login:local}"
     env_file: ../../apps/login/.env.test
-    network_mode: service:devcontainer
+    network_mode: service:mock-zitadel
     environment:
       NODE_ENV: test
       PORT: 3001
diff --git a/.devcontainer/login-integration-debug/docker-compose.yml b/.devcontainer/login-integration-debug/docker-compose.yml
index 8985326149..db663e1c30 100644
--- a/.devcontainer/login-integration-debug/docker-compose.yml
+++ b/.devcontainer/login-integration-debug/docker-compose.yml
@@ -4,4 +4,3 @@ services:
     extends:
       file: ../base/docker-compose.yml
       service: devcontainer
-    network_mode: service:mock-zitadel
diff --git a/.github/workflows/login-integration-test.yml b/.github/workflows/login-integration-test.yml
index 32105e30be..14c6592a31 100644
--- a/.github/workflows/login-integration-test.yml
+++ b/.github/workflows/login-integration-test.yml
@@ -10,7 +10,6 @@ on:
 jobs:
 
   login-integration-test:
-    if: ${{ github.event_name == 'pull_request' }}
     name: login-integration-test
     runs-on: depot-ubuntu-22.04-8
     steps:
diff --git a/package.json b/package.json
index 5b1acd5e17..2074de0a52 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
     "generate": "turbo run generate",
     "changeset": "changeset",
     "devcontainer": "devcontainer",
-    "devcontainer:lint-unit": "devcontainer up --config .devcontainer/turbo-lint-unit/devcontainer.json --workspace-folder . --remove-existing-container",
-    "devcontainer:integration:login": "devcontainer up --config .devcontainer/login-integration/devcontainer.json --workspace-folder . --remove-existing-container"
+    "devcontainer:lint-unit": "devcontainer up --config .devcontainer/turbo-lint-unit/devcontainer.json --workspace-folder .",
+    "devcontainer:integration:login": "devcontainer up --config .devcontainer/login-integration/devcontainer.json --workspace-folder ."
   },
   "pnpm": {
     "overrides": {