diff --git a/Makefile b/Makefile
index 14f471e034..ebc3b73a4c 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ login-test-acceptance-build-bake:
 	$(BAKE_CLI_WITH_COMMON_ARGS) login-test-acceptance login-standalone
 
 login-test-acceptance-build-compose:
-	$(BAKE_CLI_WITH_COMMON_ARGS) --load setup sink oidcrp samlsp
+	$(BAKE_CLI_WITH_COMMON_ARGS) --load setup sink
 
 login-test-acceptance-build: login-test-acceptance-build-compose login-test-acceptance-build-bake
 	@:
diff --git a/apps/login-test-acceptance/docker-compose-dev.yaml b/apps/login-test-acceptance/docker-compose-dev.yaml
new file mode 100644
index 0000000000..47fa6bcb0d
--- /dev/null
+++ b/apps/login-test-acceptance/docker-compose-dev.yaml
@@ -0,0 +1,14 @@
+services:
+  traefik:
+    extra_hosts:
+      - host.docker.internal:host-gateway
+  setup:
+    environment:
+      LOGIN_BASE_URL: https://localhost/ui/v2/login/
+      ZITADEL_API_INTERNAL_URL: http://zitadel:8080
+      ZITADEL_API_URL: https://localhost
+      ZITADEL_API_DOMAIN: localhost
+    volumes:
+      - pat:/pat # Read the PAT file from zitadels setup
+      - ./env:/acceptance-env # Write the environment variables file for the tests
+      - ../login:/login-env # Write the environment variables file for the login
diff --git a/apps/login-test-acceptance/docker-compose.yaml b/apps/login-test-acceptance/docker-compose.yaml
index 1cbf82f8af..07c817ca4d 100644
--- a/apps/login-test-acceptance/docker-compose.yaml
+++ b/apps/login-test-acceptance/docker-compose.yaml
@@ -9,6 +9,7 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.zitadel.rule=!PathPrefix(`/ui/v2/login`)"
       - "traefik.http.services.zitadel-service.loadbalancer.server.scheme=h2c"
+      - "traefik.http.middlewares.zitadel-headers.headers.customrequestheaders.Host=zitadel"
     ports:
       - "8080:8080"
     volumes:
@@ -256,12 +257,12 @@ services:
         condition: "service_healthy"
       sink:
         condition: service_healthy
-      oidcrp:
-        condition: service_healthy
+#      oidcrp:
+#        condition: service_healthy
 #      oidcop:
 #        condition: service_healthy
-      samlsp:
-        condition: service_healthy
+#      samlsp:
+#        condition: service_healthy
 #      samlidp:
 #        condition: service_healthy
 
diff --git a/apps/login-test-acceptance/go-command.Dockerfile.dockerignore b/apps/login-test-acceptance/go-command.Dockerfile.dockerignore
deleted file mode 100644
index 799995f5e3..0000000000
--- a/apps/login-test-acceptance/go-command.Dockerfile.dockerignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*
-!idp
-!oidcrp
-!samlsp
-!setup
-!sink
diff --git a/apps/login-test-acceptance/package.json b/apps/login-test-acceptance/package.json
index 3ba9e713c0..6f3944bb89 100644
--- a/apps/login-test-acceptance/package.json
+++ b/apps/login-test-acceptance/package.json
@@ -2,14 +2,8 @@
   "name": "login-test-acceptance",
   "private": true,
   "scripts": {
-    "test:acceptance": "pnpm exec playwright test",
-    "run-zitadel": "docker compose -f ./acceptance/docker-compose.yaml run setup",
-    "run-sink": "docker compose -f ./acceptance/docker-compose.yaml up -d sink",
-    "run-samlsp": "docker compose -f ./acceptance/saml/docker-compose.yaml up -d",
-    "run-samlidp": "docker compose -f ./acceptance/idp/saml/docker-compose.yaml up -d",
-    "run-oidcrp": "docker compose -f ./acceptance/oidc/docker-compose.yaml up -d",
-    "run-oidcop": "docker compose -f ./acceptance/idp/oidc/docker-compose.yaml up -d",
-    "stop": "docker compose -f ./acceptance/docker-compose.yaml stop"
+    "test:acceptance": "pnpm exec playwright",
+    "test:acceptance:setup": "pnpm exec playwright"
   },
   "devDependencies": {
     "@otplib/core": "^12.0.0",
diff --git a/apps/login-test-acceptance/zitadel.yaml b/apps/login-test-acceptance/zitadel.yaml
index 9ee082d040..96217a703f 100644
--- a/apps/login-test-acceptance/zitadel.yaml
+++ b/apps/login-test-acceptance/zitadel.yaml
@@ -1,4 +1,4 @@
-ExternalDomain: traefik
+ExternalDomain: zitadel
 ExternalSecure: true
 ExternalPort: 443