diff --git a/.github/workflows/ffo-test.yml b/.github/workflows/ffo-test.yml
index 8c374e2124b..5a5d8b49b84 100644
--- a/.github/workflows/ffo-test.yml
+++ b/.github/workflows/ffo-test.yml
@@ -12,6 +12,8 @@ jobs:
       group: zitadel-public
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - uses: docker/setup-buildx-action@v3
       - uses: docker/bake-action@v6
         with:
diff --git a/Dockerfile.core b/Dockerfile.core
index 353374484ea..298b1d0c93b 100644
--- a/Dockerfile.core
+++ b/Dockerfile.core
@@ -17,7 +17,6 @@ RUN make core_build
 
 FROM base AS build
 RUN make compile_pipeline
-RUN ls -la && pwd
 
 FROM base AS lint
 RUN make core_lint
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 165c1c0809a..650484d4040 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -49,6 +49,18 @@ target "console" {
     "lint"   = []
     "image"   = ["${REGISTRY}/console:${GITHUB_SHA}"]
   }[tgt]
+  cache-to = {
+    "build"  =  ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+    "output" =  ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+    "lint"   =  ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+    "image"   = ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+  }[tgt]
+    cache-from = {
+    "build"  =  ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+    "output" =  ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+    "lint"   =  ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+    "image"   = ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+  }[tgt]
   target = tgt
 }
 
@@ -82,6 +94,18 @@ target "core" {
     "output" = []
     "lint"   = []
     "image"   = ["${REGISTRY}/zitadel:${GITHUB_SHA}"]
+  }[tgt]
+    cache-to = {
+    "build"  =  ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+    "output" =  ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+    "lint"   =  ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+    "image"   = ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+  }[tgt]
+    cache-from = {
+    "build"  =  ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+    "output" =  ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+    "lint"   =  ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
+    "image"   = ["type=gha,ignore-error=true,mode=max,scope=${tgt}"]
   }[tgt]
   target = tgt
 }
\ No newline at end of file