diff --git a/docker-bake.hcl b/docker-bake.hcl
index c76b1e67ed..bd09dddd1f 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,18 +1,9 @@
 group "default" {
   targets = [
     "login-lint",
-    "login-test-unit",
-    "core-mock",
-    "login-test-integration",
-    "login-test-acceptance",
   ]
 }
 
-target "default" {
-  cache-from = ["type=gha"]
-  cache-to   = ["type=gha,ignore-error=true,mode=max"]
-}
-
 target "login-pnpm" {
   dockerfile = "dockerfiles/login-pnpm.Dockerfile"
 }
@@ -33,6 +24,8 @@ target "login-test-unit" {
   contexts = {
     login-client   = "target:login-client"
   }
+  cache-from = ["type=gha,scope=lint"]
+  cache-to   = ["type=gha,scope=lint,ignore-error=true,mode=max"]
   output = ["type=docker"]
   tags = ["${LOGIN_TEST_UNIT_TAG}"]
 }