diff --git a/build/package/image/function-mmsys-test-encode/Dockerfile.generic.generic b/build/package/image/function-mmsys-test-encode/Dockerfile.generic.generic
index 7dc90e9..367025c 100644
--- a/build/package/image/function-mmsys-test-encode/Dockerfile.generic.generic
+++ b/build/package/image/function-mmsys-test-encode/Dockerfile.generic.generic
@@ -22,7 +22,7 @@ ARG TARGETOS \
 
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/app/tmp \
+    --mount=type=cache,target=/app/tmp,id=app-tmp-${TARGETARCH}-${TARGETVARIANT},sharing=locked \
     make build-task-shim \
       "OS=${TARGETOS}" \
       "ARCH=${TARGETARCH}" \
diff --git a/build/package/image/function-noop/Dockerfile.generic.generic b/build/package/image/function-noop/Dockerfile.generic.generic
index f893259..51a5bb5 100644
--- a/build/package/image/function-noop/Dockerfile.generic.generic
+++ b/build/package/image/function-noop/Dockerfile.generic.generic
@@ -22,7 +22,7 @@ ARG TARGETOS \
 
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/app/tmp \
+    --mount=type=cache,target=/app/tmp,id=app-tmp-${TARGETARCH}-${TARGETVARIANT},sharing=locked \
     make build-task-shim \
       "OS=${TARGETOS}" \
       "ARCH=${TARGETARCH}" \
diff --git a/build/package/image/function-sleep/Dockerfile.generic.generic b/build/package/image/function-sleep/Dockerfile.generic.generic
index 959725d..38e7c52 100644
--- a/build/package/image/function-sleep/Dockerfile.generic.generic
+++ b/build/package/image/function-sleep/Dockerfile.generic.generic
@@ -22,7 +22,7 @@ ARG TARGETOS \
 
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/app/tmp \
+    --mount=type=cache,target=/app/tmp,id=app-tmp-${TARGETARCH}-${TARGETVARIANT},sharing=locked \
     make build-task-shim \
       "OS=${TARGETOS}" \
       "ARCH=${TARGETARCH}" \
diff --git a/build/package/image/gateway-nbmp/Dockerfile.generic.generic b/build/package/image/gateway-nbmp/Dockerfile.generic.generic
index 9cd4c9a..ccb38ab 100644
--- a/build/package/image/gateway-nbmp/Dockerfile.generic.generic
+++ b/build/package/image/gateway-nbmp/Dockerfile.generic.generic
@@ -20,7 +20,7 @@ ARG TARGETOS \
 
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/app/tmp \
+    --mount=type=cache,target=/app/tmp,id=app-tmp-${TARGETARCH}-${TARGETVARIANT},sharing=locked \
     make build-gateway-nbmp \
       "OS=${TARGETOS}" \
       "ARCH=${TARGETARCH}" \
diff --git a/build/package/image/workflow-manager-helper/Dockerfile.generic.generic b/build/package/image/workflow-manager-helper/Dockerfile.generic.generic
index e7afc32..6486b8e 100644
--- a/build/package/image/workflow-manager-helper/Dockerfile.generic.generic
+++ b/build/package/image/workflow-manager-helper/Dockerfile.generic.generic
@@ -22,7 +22,7 @@ ARG TARGETOS \
 
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/app/tmp \
+    --mount=type=cache,target=/app/tmp,id=app-tmp-${TARGETARCH}-${TARGETVARIANT},sharing=locked \
     make build-workflow-manager-helper \
       "OS=${TARGETOS}" \
       "ARCH=${TARGETARCH}" \
diff --git a/build/package/image/workflow-manager/Dockerfile.generic.generic b/build/package/image/workflow-manager/Dockerfile.generic.generic
index 4a5bfd3..363e371 100644
--- a/build/package/image/workflow-manager/Dockerfile.generic.generic
+++ b/build/package/image/workflow-manager/Dockerfile.generic.generic
@@ -20,7 +20,7 @@ ARG TARGETOS \
 
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/app/tmp \
+    --mount=type=cache,target=/app/tmp,id=app-tmp-${TARGETARCH}-${TARGETVARIANT},sharing=locked \
     make build-workflow-manager \
       "OS=${TARGETOS}" \
       "ARCH=${TARGETARCH}" \
diff --git a/build/package/image/workflow-opentelemetry-adapter/Dockerfile.generic.generic b/build/package/image/workflow-opentelemetry-adapter/Dockerfile.generic.generic
index 63cfe09..6654da2 100644
--- a/build/package/image/workflow-opentelemetry-adapter/Dockerfile.generic.generic
+++ b/build/package/image/workflow-opentelemetry-adapter/Dockerfile.generic.generic
@@ -20,7 +20,7 @@ ARG TARGETOS \
 
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/app/tmp \
+    --mount=type=cache,target=/app/tmp,id=app-tmp-${TARGETARCH}-${TARGETVARIANT},sharing=locked \
     make build-workflow-opentelemetry-adapter \
       "OS=${TARGETOS}" \
       "ARCH=${TARGETARCH}" \
diff --git a/build/package/image/workflow-vacuum/Dockerfile.generic.generic b/build/package/image/workflow-vacuum/Dockerfile.generic.generic
index 4b239b3..17cc71a 100644
--- a/build/package/image/workflow-vacuum/Dockerfile.generic.generic
+++ b/build/package/image/workflow-vacuum/Dockerfile.generic.generic
@@ -20,7 +20,7 @@ ARG TARGETOS \
 
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/app/tmp \
+    --mount=type=cache,target=/app/tmp,id=app-tmp-${TARGETARCH}-${TARGETVARIANT},sharing=locked \
     make build-workflow-vacuum \
       "OS=${TARGETOS}" \
       "ARCH=${TARGETARCH}" \