diff --git a/templates/commands/clarify.md b/templates/commands/clarify.md
index 65f2536f..b91d0f90 100644
--- a/templates/commands/clarify.md
+++ b/templates/commands/clarify.md
@@ -1,5 +1,9 @@
 ---
 description: Identify underspecified areas in the current feature spec by asking up to 5 highly targeted clarification questions and encoding answers back into the spec.
+handoffs: 
+  - label: Build Technical Plan
+    agent: speckit.plan
+    prompt: Create a plan for the spec. I am building with...
 scripts:
    sh: scripts/bash/check-prerequisites.sh --json --paths-only
    ps: scripts/powershell/check-prerequisites.ps1 -Json -PathsOnly
diff --git a/templates/commands/specify.md b/templates/commands/specify.md
index a7ae5dd4..1329120d 100644
--- a/templates/commands/specify.md
+++ b/templates/commands/specify.md
@@ -3,10 +3,11 @@ description: Create or update the feature specification from a natural language
 handoffs: 
   - label: Build Technical Plan
     agent: speckit.plan
-    prompt: Create a plan for the spec
+    prompt: Create a plan for the spec. I am building with...
   - label: Clarify Spec Requirements
     agent: speckit.clarify
     prompt: Clarify specification requirements
+    send: true
 scripts:
   sh: scripts/bash/create-new-feature.sh --json "{ARGS}"
   ps: scripts/powershell/create-new-feature.ps1 -Json "{ARGS}"