diff --git a/.devcontainer/base/Dockerfile b/.devcontainer/base/Dockerfile
index 43233b4ce9..8b5a83cbcc 100644
--- a/.devcontainer/base/Dockerfile
+++ b/.devcontainer/base/Dockerfile
@@ -10,6 +10,7 @@ ENV SHELL=/bin/bash \
 
 RUN apt-get update && \
     apt-get --no-install-recommends install -y \
+    # Cypress dependencies
     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@10.13.1 --activate
diff --git a/.devcontainer/login-integration/docker-compose.yaml b/.devcontainer/login-integration/docker-compose.yaml
index a20b91dfea..02c52f3d02 100644
--- a/.devcontainer/login-integration/docker-compose.yaml
+++ b/.devcontainer/login-integration/docker-compose.yaml
@@ -9,6 +9,7 @@ services:
     environment:
       CORE_MOCK_STUBS_URL: http://localhost:22220/v1/stubs
       LOGIN_BASE_URL: http://localhost:3001/ui/v2/login
+      CYPRESS_CACHE_FOLDER: /workspaces/.artifacts/cypress
     network_mode: service:mock-zitadel
     depends_on:
       login-integration: