diff --git a/src/atlassian/workflow-overrides/4-implementation/code-review/instructions-jira.md b/src/atlassian/workflow-overrides/4-implementation/code-review/instructions-jira.md
index be30318e1..55e6244e0 100644
--- a/src/atlassian/workflow-overrides/4-implementation/code-review/instructions-jira.md
+++ b/src/atlassian/workflow-overrides/4-implementation/code-review/instructions-jira.md
@@ -114,9 +114,20 @@ additional_fields:
 <action>Report the specific findings that need to be addressed</action>
 </step>
 
-<step n="5" goal="Unlock and report">
+<step n="5" goal="Unlock, hand off, and report">
 <action>Invoke `lock-issue` task with `issue_key: "{selected_issue_key}"`, `action: "unlock"`, `agent_name: "code-review"`</action>
 
+{if_passed}
+<action>Invoke `post-handoff` task with:</action>
+
+```
+handoff_to: "SM"
+handoff_type: "review_complete"
+summary: "Code review passed for {selected_issue_key}. Story transitioned to Done. SM should check if next story is ready or if retrospective is needed."
+jira_issue_keys: ["{selected_issue_key}"]
+```
+{end_if}
+
 <action>Report to user:</action>
 
 **Code Review: {verdict}**
diff --git a/src/atlassian/workflow-overrides/4-implementation/create-story/instructions-jira.md b/src/atlassian/workflow-overrides/4-implementation/create-story/instructions-jira.md
index 87fa567b4..f5bdde928 100644
--- a/src/atlassian/workflow-overrides/4-implementation/create-story/instructions-jira.md
+++ b/src/atlassian/workflow-overrides/4-implementation/create-story/instructions-jira.md
@@ -120,7 +120,16 @@ fallback_status_name: "Ready for Dev"
 ```
 </step>
 
-<step n="7" goal="Report">
+<step n="7" goal="Hand off and report">
+<action>Invoke `post-handoff` task with:</action>
+
+```
+handoff_to: "Dev"
+handoff_type: "story_prepared"
+summary: "Story {selected_issue_key} prepared with full dev context and subtasks. Ready for implementation."
+jira_issue_keys: ["{selected_issue_key}"]
+```
+
 <action>Report to user:</action>
 
 **Story Prepared: {story_title}**
diff --git a/src/atlassian/workflow-overrides/4-implementation/dev-story/instructions-jira.md b/src/atlassian/workflow-overrides/4-implementation/dev-story/instructions-jira.md
index 4887a4623..b51906043 100644
--- a/src/atlassian/workflow-overrides/4-implementation/dev-story/instructions-jira.md
+++ b/src/atlassian/workflow-overrides/4-implementation/dev-story/instructions-jira.md
@@ -118,6 +118,15 @@ fallback_status_name: "Review"
 
 <action>Invoke `lock-issue` task with `issue_key: "{selected_issue_key}"`, `action: "unlock"`, `agent_name: "dev"`</action>
 
+<action>Invoke `post-handoff` task with:</action>
+
+```
+handoff_to: "QA"
+handoff_type: "dev_complete"
+summary: "Implementation complete for {selected_issue_key}. All tests passing. Ready for code review."
+jira_issue_keys: ["{selected_issue_key}"]
+```
+
 <action>Report to user:</action>
 
 **Story Complete: {story_title}**