diff --git a/core/src/plugins/kubernetes/container/build/buildkit.ts b/core/src/plugins/kubernetes/container/build/buildkit.ts
index bc4449d9f8..158689e8e2 100644
--- a/core/src/plugins/kubernetes/container/build/buildkit.ts
+++ b/core/src/plugins/kubernetes/container/build/buildkit.ts
@@ -39,6 +39,7 @@ import { PodRunner } from "../../run"
 export const buildkitImageName = "gardendev/buildkit:v0.8.1-4"
 export const buildkitDeploymentName = "garden-buildkit"
 const buildkitContainerName = "buildkitd"
+const insecureRegistryClause = ",registry.insecure=true"
 
 const deployLock = new AsyncLock()
 
@@ -115,11 +116,13 @@ export const buildkitBuildHandler: BuildHandler = async (params) => {
   const cacheTag = "_buildcache"
   // Prepare the build command (this thing, while an otherwise excellent piece of software, is clearly is not meant for
   // everyday human usage)
-  let outputSpec = `type=image,"name=${deploymentImageId},${deploymentImageName}:${cacheTag}",push=true`
+  let outputSpec = `type=image,"name=${deploymentImageId}",push=true`
+  let cacheSpec = `type=registry,ref=${deploymentImageName}:${cacheTag},mode=max`
 
   if (usingInClusterRegistry(provider)) {
     // The in-cluster registry is not exposed, so we don't configure TLS on it.
-    outputSpec += ",registry.insecure=true"
+    outputSpec += insecureRegistryClause
+    cacheSpec += insecureRegistryClause
   }
 
   const command = [
@@ -135,9 +138,9 @@ export const buildkitBuildHandler: BuildHandler = async (params) => {
     "--output",
     outputSpec,
     "--export-cache",
-    "type=inline",
+    cacheSpec,
     "--import-cache",
-    `type=registry,ref=${deploymentImageName}:${cacheTag}`,
+    cacheSpec,
     ...getBuildkitFlags(module),
   ]
 
diff --git a/examples/demo-project/garden.yml b/examples/demo-project/garden.yml
index 2eeb32859b..c99829b329 100644
--- a/examples/demo-project/garden.yml
+++ b/examples/demo-project/garden.yml
@@ -16,7 +16,7 @@ providers:
     context: ${var.remoteContext}
     namespace: ${environment.namespace}
     defaultHostname: ${var.userId}-demo-project.dev-1.sys.garden
-    buildMode: kaniko
+    buildMode: cluster-buildkit
   - name: kubernetes
     environments: [testing]
     # Replace these values as appropriate