diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml
index f8eb8df..9ff8dda 100644
--- a/.gitea/workflows/pipeline.yml
+++ b/.gitea/workflows/pipeline.yml
@@ -130,6 +130,6 @@ jobs:
           tags: |
             registry.infra.mintel.me/mintel/${{ matrix.image }}:${{ github.ref_name }}
             registry.infra.mintel.me/mintel/${{ matrix.image }}:latest
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=registry,ref=registry.infra.mintel.me/mintel/${{ matrix.image }}:buildcache
+          cache-to: type=registry,ref=registry.infra.mintel.me/mintel/${{ matrix.image }}:buildcache,mode=max
 
diff --git a/packages/infra/docker/Dockerfile.gatekeeper b/packages/infra/docker/Dockerfile.gatekeeper
index a053a7c..ec99f24 100644
--- a/packages/infra/docker/Dockerfile.gatekeeper
+++ b/packages/infra/docker/Dockerfile.gatekeeper
@@ -32,7 +32,8 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
 COPY . .
 
 # Build Gatekeeper and its dependencies
-RUN pnpm --filter @mintel/gatekeeper... build
+RUN --mount=type=cache,target=/app/packages/gatekeeper/.next/cache \
+    pnpm --filter @mintel/gatekeeper... build
 RUN mkdir -p packages/gatekeeper/public
 
 # Step 2: Runner stage