diff --git a/templates/commands/constitution.md b/templates/commands/constitution.md
index 0344142b..d3bd158e 100644
--- a/templates/commands/constitution.md
+++ b/templates/commands/constitution.md
@@ -2,7 +2,7 @@
 description: Create or update the project constitution from interactive or provided principle inputs, ensuring all dependent templates stay in sync.
 handoffs: 
   - label: Build Specification
-    agent: speckit.spec
+    agent: speckit.specify
     prompt: Implement the feature specification based on the updated constitution. I want to build...
 ---
 
diff --git a/templates/commands/plan.md b/templates/commands/plan.md
index f4a98f1c..06b4a6fc 100644
--- a/templates/commands/plan.md
+++ b/templates/commands/plan.md
@@ -4,7 +4,9 @@ handoffs:
   - label: Create Tasks
     agent: speckit.tasks
     prompt: Break the plan into tasks
-    send: true
+  - label: Create Checklist
+    agent: speckit.checklist
+    prompt: Create a checklist for the following domain...
 scripts:
   sh: scripts/bash/setup-plan.sh --json
   ps: scripts/powershell/setup-plan.ps1 -Json
diff --git a/templates/commands/specify.md b/templates/commands/specify.md
index b9499246..a7ae5dd4 100644
--- a/templates/commands/specify.md
+++ b/templates/commands/specify.md
@@ -4,6 +4,9 @@ handoffs:
   - label: Build Technical Plan
     agent: speckit.plan
     prompt: Create a plan for the spec
+  - label: Clarify Spec Requirements
+    agent: speckit.clarify
+    prompt: Clarify specification requirements
 scripts:
   sh: scripts/bash/create-new-feature.sh --json "{ARGS}"
   ps: scripts/powershell/create-new-feature.ps1 -Json "{ARGS}"
diff --git a/templates/commands/tasks.md b/templates/commands/tasks.md
index 561b664c..c3179e3f 100644
--- a/templates/commands/tasks.md
+++ b/templates/commands/tasks.md
@@ -1,6 +1,10 @@
 ---
 description: Generate an actionable, dependency-ordered tasks.md for the feature based on available design artifacts.
 handoffs: 
+  - label: Analyze For Consistency
+    agent: speckit.analyze
+    prompt: Start the implementation in phases
+    send: true
   - label: Implement Project
     agent: speckit.implement
     prompt: Start the implementation in phases