diff --git a/task-templates/workflow/scope-decompose-sonnet@1.yaml b/task-templates/workflow/scope-decompose-sonnet@1.yaml
index 7c5fb7c..4bf1948 100644
--- a/task-templates/workflow/scope-decompose-sonnet@1.yaml
+++ b/task-templates/workflow/scope-decompose-sonnet@1.yaml
@@ -1,7 +1,7 @@
 name: scope-decompose-sonnet
 version: 1
 description: Scope and decompose a spec into tagged tasks using Sonnet planning
-runtime: spec-writing-airouter-repo
+runtime: spec-writing-sonnet-repo
 input:
   state: spec-reviewed-arch
   tags_forbidden: []
@@ -15,10 +15,13 @@ scope_budget:
 nodes:
   - id: agent
     kind: agent
-    template: spec-writing-airouter-repo
+    # Decomposition is spec-test-tier work (claude/stage-routing.md): Sonnet,
+    # not airouter. 2026-07-04 E2E: Qwen3.6 empty-delivered this stage (task
+    # "succeeded" touching only .gitignore, zero work items created) — the
+    # template NAME never set the model; the node model: field does.
+    template: spec-writing-sonnet-repo
     cli: agentic
-    model: Qwen3.6
-    labels: [airouter]
+    model: sonnet
     runtime_env:
       AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git"
       AGENT_BRANCH: "spec/auto-draft"