diff --git a/.devcontainer/base/docker-compose.yaml b/.devcontainer/base/docker-compose.yaml
index 2aee9b2572..71791ebc6a 100644
--- a/.devcontainer/base/docker-compose.yaml
+++ b/.devcontainer/base/docker-compose.yaml
@@ -32,7 +32,7 @@ services:
 
   zitadel:
     container_name: zitadel
-    image: "${ZITADEL_TAG:-ghcr.io/zitadel/zitadel:v4.0.0-rc.2}"
+    image: "${ZITADEL_TAG:-ghcr.io/zitadel/zitadel:latest}"
     command: 'start-from-init --masterkey "MasterkeyNeedsToHave32Characters" --config /zitadel.yaml --steps /zitadel.yaml'
     volumes:
       - ../../apps/login/acceptance/pat:/pat:delegated
@@ -76,7 +76,7 @@ services:
 
   login-acceptance:
     container_name: login
-    image: "${LOGIN_TAG:-ghcr.io/zitadel/zitadel-login:v4.0.0-rc.2}"
+    image: "${LOGIN_TAG:-ghcr.io/zitadel/zitadel-login:latest}"
     network_mode: service:devcontainer
     volumes:
       - ../../apps/login/.env.test.local:/env-files/.env:cached
diff --git a/.devcontainer/login-integration/docker-compose.yaml b/.devcontainer/login-integration/docker-compose.yaml
index 44b4891e7e..c750be8aea 100644
--- a/.devcontainer/login-integration/docker-compose.yaml
+++ b/.devcontainer/login-integration/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
 
   login-integration:
     container_name: login-integration
-    image: "${LOGIN_TAG:-zitadel-login:local}"
+    image: "${LOGIN_TAG:-ghcr.io/zitadel/zitadel-login:latest}"
     build:
       context: ../..
       dockerfile: build/login/Dockerfile