diff --git a/scripts/src/pikaoa-test-delivery-renderer.test.ts b/scripts/src/pikaoa-test-delivery-renderer.test.ts
index 2585747e..6421cb61 100644
--- a/scripts/src/pikaoa-test-delivery-renderer.test.ts
+++ b/scripts/src/pikaoa-test-delivery-renderer.test.ts
@@ -48,6 +48,15 @@ describe("PikaOA test PaC renderer", () => {
       const rendered = renderPikaoaTestDesiredPipeline(rendererBinding(), source);
       const spec = rendered.pipeline.spec as Record<string, unknown>;
       const tasks = spec.tasks as Array<Record<string, unknown>>;
+      for (const task of tasks) {
+        const taskSpec = task.taskSpec as Record<string, unknown>;
+        expect(taskSpec.workspaces).toEqual([{ name: "workspace", mountPath: "/workspace" }]);
+        const steps = taskSpec.steps as Array<Record<string, unknown>>;
+        for (const step of steps) {
+          const mounts = (step.volumeMounts ?? []) as Array<Record<string, unknown>>;
+          expect(mounts.some((mount) => mount.name === "workspace")).toBe(false);
+        }
+      }
       for (const name of ["build-api", "build-worker", "build-web"]) {
         const task = tasks.find((item) => item.name === name);
         expect(task?.runAfter).toEqual(["source"]);
diff --git a/scripts/src/pikaoa-test-delivery-renderer.ts b/scripts/src/pikaoa-test-delivery-renderer.ts
index 9ff83392..4524142e 100644
--- a/scripts/src/pikaoa-test-delivery-renderer.ts
+++ b/scripts/src/pikaoa-test-delivery-renderer.ts
@@ -98,7 +98,7 @@ function sourceTask(target: TestTargetSpec): Record<string, unknown> {
         { name: "gitops-username", type: "string" },
         { name: "gitops-secret-name", type: "string" },
       ],
-      workspaces: [{ name: "workspace" }],
+      workspaces: [{ name: "workspace", mountPath: "/workspace" }],
       steps: [{
         name: "checkout",
         image: target.ci.toolsImage,
@@ -132,7 +132,6 @@ printf '{"ok":true,"phase":"source","sourceCommit":"%s","valuesPrinted":false}\n
 `,
         securityContext: nonRootSecurity(),
         volumeMounts: [
-          { name: "workspace", mountPath: "/workspace" },
           { name: "source-token", mountPath: "/var/run/pikaoa-source", readOnly: true },
         ],
       }],
@@ -158,7 +157,7 @@ function imageBuildTask(target: TestTargetSpec, component: "api" | "worker" | "w
     runAfter: ["source"],
     taskSpec: {
       params: [{ name: "revision", type: "string" }],
-      workspaces: [{ name: "workspace" }],
+      workspaces: [{ name: "workspace", mountPath: "/workspace" }],
       results: [{ name: "digest", type: "string" }, { name: "image", type: "string" }],
       steps: [{
         name: "build",
@@ -186,7 +185,6 @@ printf '%s@%s' ${shellSingleQuote(imageRepository)} "$digest" > "$(results.image
 printf '{"ok":true,"phase":"${taskName}","sourceCommit":"%s","imageTag":"%s","digest":"%s","valuesPrinted":false}\n' "$revision" "$tag" "$digest"
 `,
         securityContext: { privileged: true, runAsUser: 1000, runAsGroup: 1000 },
-        volumeMounts: [{ name: "workspace", mountPath: "/workspace" }],
       }],
     },
     params: [{ name: "revision", value: "$(params.revision)" }],
@@ -210,7 +208,7 @@ function gitOpsTask(target: TestTargetSpec, runtimeManifest: string): Record<str
         { name: "worker-image", type: "string" },
         { name: "web-image", type: "string" },
       ],
-      workspaces: [{ name: "workspace" }],
+      workspaces: [{ name: "workspace", mountPath: "/workspace" }],
       steps: [{
         name: "publish",
         image: target.ci.toolsImage,
@@ -281,7 +279,6 @@ printf '{"ok":true,"status":"published","phase":"gitops-publish","sourceCommitId
 `,
         securityContext: nonRootSecurity(),
         volumeMounts: [
-          { name: "workspace", mountPath: "/workspace" },
           { name: "gitops-token", mountPath: "/var/run/pikaoa-gitops", readOnly: true },
         ],
       }],