diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index efbb0f68cd..6fa0dd4a09 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -49,5 +49,6 @@ jobs:
           set: |
             *.cache-from=type=gha
             *.cache-to=type=gha,mode=max
+          targets: login-lint
       - name: Run
         run: make login-lint
diff --git a/Makefile b/Makefile
index 194d74cf6a..1b9ddd82cc 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ login-lint-run:
 
 .PHONY: login-lint
 login-lint: login-lint-build
-	./scripts/run_or_skip.sh login-lint-run $(LOGIN_LINT_TAG)
+#	./scripts/run_or_skip.sh login-lint-run $(LOGIN_LINT_TAG)
 
 login-test-unit-build:
 	docker buildx bake login-test-unit
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 410cb46873..36ad3ba2e8 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,7 +1,5 @@
 group "default" {
   targets = [
-    "login-pnpm",
-    "login-dev-base",
     "login-lint",
   ]
 }
diff --git a/dockerfiles/login-lint.Dockerfile b/dockerfiles/login-lint.Dockerfile
index 7094712fa9..195e12e49c 100644
--- a/dockerfiles/login-lint.Dockerfile
+++ b/dockerfiles/login-lint.Dockerfile
@@ -7,3 +7,4 @@ COPY apps/login/package.json apps/login/
 RUN --mount=type=cache,target=${PNPM_HOME} \
     pnpm install --frozen-lockfile --prefer-offline --workspace-root --filter zitadel-login
 COPY apps/login apps/login
+RUN pnpm lint && pnpm format --check