diff --git a/task-templates/workflow/review-spec-arch-airouter@1.yaml b/task-templates/workflow/review-spec-arch-airouter@1.yaml
index 32044b5..5602133 100644
--- a/task-templates/workflow/review-spec-arch-airouter@1.yaml
+++ b/task-templates/workflow/review-spec-arch-airouter@1.yaml
@@ -21,7 +21,7 @@ nodes:
     labels: [airouter]
     runtime_env:
       AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git"
-      AGENT_BRANCH: "spec/auto-draft"
+      AGENT_BRANCH: "spec/${item.uuid}"
     prompt: |
       The agent-runtimes project repo is cloned at /workspace/project.
       Change to that directory before doing any work.
diff --git a/task-templates/workflow/review-spec-arch-opus@1.yaml b/task-templates/workflow/review-spec-arch-opus@1.yaml
index 621345d..9838695 100644
--- a/task-templates/workflow/review-spec-arch-opus@1.yaml
+++ b/task-templates/workflow/review-spec-arch-opus@1.yaml
@@ -21,7 +21,7 @@ nodes:
     labels: [airouter]
     runtime_env:
       AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git"
-      AGENT_BRANCH: "spec/auto-draft"
+      AGENT_BRANCH: "spec/${item.uuid}"
     prompt: |
       The agent-runtimes project repo is cloned at /workspace/project.
       Change to that directory before doing any work.
diff --git a/task-templates/workflow/scope-decompose-sonnet@1.yaml b/task-templates/workflow/scope-decompose-sonnet@1.yaml
index 4c54384..3c75fbd 100644
--- a/task-templates/workflow/scope-decompose-sonnet@1.yaml
+++ b/task-templates/workflow/scope-decompose-sonnet@1.yaml
@@ -26,7 +26,7 @@ nodes:
     model: sonnet
     runtime_env:
       AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git"
-      AGENT_BRANCH: "spec/auto-draft"
+      AGENT_BRANCH: "spec/${item.uuid}"
       CP_URL: "http://controlplane.agent-runtimes.svc.cluster.local:8100"
       # AR-38: this stage's deliverable is work items POSTed to the CP, not a
       # repo diff — the empty-deliverable audit would fail every success.
diff --git a/task-templates/workflow/spec-draft-airouter@2.yaml b/task-templates/workflow/spec-draft-airouter@2.yaml
index 54902cd..3376c63 100644
--- a/task-templates/workflow/spec-draft-airouter@2.yaml
+++ b/task-templates/workflow/spec-draft-airouter@2.yaml
@@ -22,7 +22,7 @@ nodes:
     labels: [airouter]
     runtime_env:
       AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git"
-      AGENT_BRANCH: "spec/auto-draft"
+      AGENT_BRANCH: "spec/${item.uuid}"
     prompt: |
       The agent-runtimes project repo is cloned at /workspace/project.
       Change to that directory before doing any work.
diff --git a/task-templates/workflow/spec-draft-opus@1.yaml b/task-templates/workflow/spec-draft-opus@1.yaml
index 3ace4b5..d925a94 100644
--- a/task-templates/workflow/spec-draft-opus@1.yaml
+++ b/task-templates/workflow/spec-draft-opus@1.yaml
@@ -20,7 +20,7 @@ nodes:
     model: opus
     runtime_env:
       AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git"
-      AGENT_BRANCH: "spec/auto-draft"
+      AGENT_BRANCH: "spec/${item.uuid}"
     prompt: |
       The agent-runtimes project repo is cloned at /workspace/project.
       Change to that directory before doing any work.
diff --git a/task-templates/workflow/spec-review-loop@1.yaml b/task-templates/workflow/spec-review-loop@1.yaml
index f653d7c..7a4f64f 100644
--- a/task-templates/workflow/spec-review-loop@1.yaml
+++ b/task-templates/workflow/spec-review-loop@1.yaml
@@ -27,7 +27,7 @@ nodes:
     model: claude-opus-4
     runtime_env:
       AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git"
-      AGENT_BRANCH: "spec/auto-draft"
+      AGENT_BRANCH: "spec/${item.uuid}"
     prompt: |
       The agent-runtimes project repo is cloned at /workspace/project.
       Change to that directory before doing any work.
@@ -55,7 +55,7 @@ nodes:
     model: minimax-m2
     runtime_env:
       AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git"
-      AGENT_BRANCH: "spec/auto-draft"
+      AGENT_BRANCH: "spec/${item.uuid}"
     prompt: |
       The agent-runtimes project repo is cloned at /workspace/project.
       Change to that directory before doing any work.
@@ -84,7 +84,7 @@ nodes:
     depends_on: [review-opus, review-minimax]
     runtime_env:
       AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git"
-      AGENT_BRANCH: "spec/auto-draft"
+      AGENT_BRANCH: "spec/${item.uuid}"
     prompt: |
       The agent-runtimes project repo is cloned at /workspace/project.
       Change to that directory before doing any work.
@@ -108,7 +108,7 @@ nodes:
     depends_on: [improve-sonnet]
     runtime_env:
       AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git"
-      AGENT_BRANCH: "spec/auto-draft"
+      AGENT_BRANCH: "spec/${item.uuid}"
     prompt: |
       The agent-runtimes project repo is cloned at /workspace/project.
       Change to that directory before doing any work.