diff --git a/docker-bake.hcl b/docker-bake.hcl
index 3c62892fc4..6809604c39 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -11,6 +11,11 @@ variable "BUILD_CACHE_KEY" {
 target "login-pnpm" {
   context = "."
   dockerfile = "dockerfiles/login-pnpm.Dockerfile"
+  cache-from = [
+    "type=registry,ref=${IMAGE_REGISTRY}/login-pnpm-buildcache:latest",
+    "type=registry,ref=${IMAGE_REGISTRY}/login-pnpm-buildcache:${BUILD_CACHE_KEY}"
+  ]
+  cache-to = ["type=registry,ref=${IMAGE_REGISTRY}/login-pnpm-buildcache:${BUILD_CACHE_KEY},mode=max"]
 }
 
 target "login-dev-base" {
@@ -19,6 +24,11 @@ target "login-dev-base" {
   contexts = {
     login-pnpm = "target:login-pnpm"
   }
+  cache-from = [
+    "type=registry,ref=${IMAGE_REGISTRY}/login-dev-base-buildcache:latest",
+    "type=registry,ref=${IMAGE_REGISTRY}/login-dev-base-buildcache:${BUILD_CACHE_KEY}"
+  ]
+  cache-to = ["type=registry,ref=${IMAGE_REGISTRY}/login-dev-base-buildcache:${BUILD_CACHE_KEY},mode=max"]
 }
 
 target "login-lint" {
@@ -28,8 +38,8 @@ target "login-lint" {
     login-dev-base = "target:login-dev-base"
   }
   cache-from = [
+    "type=registry,ref=${IMAGE_REGISTRY}/login-lint-buildcache:latest",
     "type=registry,ref=${IMAGE_REGISTRY}/login-lint-buildcache:${BUILD_CACHE_KEY}"
-#    "type=registry,ref=${IMAGE_REGISTRY}/login-lint-buildcache:latest"
   ]
   cache-to = ["type=registry,ref=${IMAGE_REGISTRY}/login-lint-buildcache:${BUILD_CACHE_KEY},mode=max"]
 }