diff --git a/docker-bake.hcl b/docker-bake.hcl
index 9e72e47bc5..4647ca4e19 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -10,20 +10,18 @@ variable "BUILD_CACHE_KEY" {
 
 target "login-pnpm" {
   cache-from = [
+    { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-pnpm-buildcache:${BUILD_CACHE_KEY}" },
     { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-pnpm-buildcache:latest" },
-    { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-pnpm-buildcache:${BUILD_CACHE_KEY}" }
   ]
   dockerfile = "dockerfiles/login-pnpm.Dockerfile"
-  context = "."
-}
+ }
 
 target "login-dev-base" {
   cache-from = [
+    {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-dev-base-buildcache:${BUILD_CACHE_KEY}"},
     {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-dev-base-buildcache:latest"},
-    {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-dev-base-buildcache:${BUILD_CACHE_KEY}"}
   ]
   dockerfile = "dockerfiles/login-dev-base.Dockerfile"
-  context = "."
   contexts = {
     login-pnpm = "target:login-pnpm"
   }
@@ -31,11 +29,10 @@ target "login-dev-base" {
 
 target "login-lint" {
   cache-from = [
+    {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-lint-buildcache:${BUILD_CACHE_KEY}"},
     {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-lint-buildcache:latest"},
-    {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-lint-buildcache:${BUILD_CACHE_KEY}"}
   ]
   dockerfile = "dockerfiles/login-lint.Dockerfile"
-  context = "."
   contexts = {
     login-dev-base = "target:login-dev-base"
   }