diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c6e1a0c2e4..93ccca6c9a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,10 +41,7 @@ jobs:
         with:
           source: .
           push: false
-          targets: |
-            login-pnpm
-            login-dev-base
-            login-lint
+          targets: login-pnpm,login-dev-base,login-lint
           provenance: false
           load: true
       - run: ls -la
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 6809604c39..6fd4312ef5 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -12,10 +12,13 @@ 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}"
+    { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-pnpm-buildcache:latest" },
+    { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-pnpm-buildcache:${BUILD_CACHE_KEY}" }
+  ]
+  cache-to = [
+    { "type": "inline" },
+    { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-pnpm-buildcache:${BUILD_CACHE_KEY}", "mode": "max" }
   ]
-  cache-to = ["type=registry,ref=${IMAGE_REGISTRY}/login-pnpm-buildcache:${BUILD_CACHE_KEY},mode=max"]
 }
 
 target "login-dev-base" {
@@ -25,10 +28,13 @@ target "login-dev-base" {
     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}"
+    {"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": "inline" },
+    { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-dev-base-buildcache:${BUILD_CACHE_KEY}", "mode": "max" }
   ]
-  cache-to = ["type=registry,ref=${IMAGE_REGISTRY}/login-dev-base-buildcache:${BUILD_CACHE_KEY},mode=max"]
 }
 
 target "login-lint" {
@@ -38,10 +44,13 @@ 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"},
+    {"type": "registry", "ref": "${IMAGE_REGISTRY}/login-lint-buildcache:${BUILD_CACHE_KEY}"}
+  ]
+  cache-to = [
+    { "type": "inline"},
+    { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-lint-buildcache:${BUILD_CACHE_KEY}", "mode": "max" }
   ]
-  cache-to = ["type=registry,ref=${IMAGE_REGISTRY}/login-lint-buildcache:${BUILD_CACHE_KEY},mode=max"]
 }
 
 variable "LOGIN_TEST_UNIT_TAG" {