diff --git a/task-templates/workflow/impl-review-sonnet@1.yaml b/task-templates/workflow/impl-review-sonnet@1.yaml
index f2c705e..67f51bf 100644
--- a/task-templates/workflow/impl-review-sonnet@1.yaml
+++ b/task-templates/workflow/impl-review-sonnet@1.yaml
@@ -1,7 +1,7 @@
 name: impl-review-sonnet
 version: 1
 description: Code review of implementation using Sonnet code-review
-runtime: best-practices-airouter-repo
+runtime: best-practices-opus-repo
 input:
   state: integrated
   tags_forbidden: []
@@ -15,7 +15,8 @@ scope_budget:
 nodes:
   - id: agent
     kind: agent
-    template: best-practices-airouter-repo
+    template: best-practices-opus-repo
+    model: sonnet
     prompt: |
       Code-review the implementation for the following task.
 
diff --git a/task-templates/workflow/merge@1.yaml b/task-templates/workflow/merge@1.yaml
index 9448c74..e50a849 100644
--- a/task-templates/workflow/merge@1.yaml
+++ b/task-templates/workflow/merge@1.yaml
@@ -1,7 +1,7 @@
 name: merge
 version: 1
 description: Prepare a reviewed implementation for merge — runs pre-merge checks and marks item merge-ready
-runtime: best-practices-airouter-repo
+runtime: best-practices-opus-repo
 input:
   state: impl-reviewed
   tags_forbidden: []
@@ -15,10 +15,8 @@ scope_budget:
 nodes:
   - id: agent
     kind: agent
-    template: best-practices-airouter-repo
-    cli: agentic
-    model: Qwen3.6
-    labels: [airouter]
+    template: best-practices-opus-repo
+    model: sonnet
     runtime_env:
       AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git"
       AGENT_BRANCH: "spec/auto-draft"