diff --git a/src/bmm/agents/quick-flow-solo-dev.agent.yaml b/src/bmm/agents/quick-flow-solo-dev.agent.yaml
index 60984b204..e019804e2 100644
--- a/src/bmm/agents/quick-flow-solo-dev.agent.yaml
+++ b/src/bmm/agents/quick-flow-solo-dev.agent.yaml
@@ -24,7 +24,7 @@ agent:
       description: "[QS] Quick Spec: Architect a quick but complete technical spec with implementation-ready stories/specs"
 
     - trigger: QD or fuzzy match on quick-dev
-      exec: "{project-root}/_bmad/bmm/workflows/bmad-quick-flow/bmad-quick-dev/workflow.md"
+      exec: "skill:bmad-quick-dev"
       description: "[QD] Quick-flow Develop: Implement a story tech spec end-to-end (Core of Quick Flow)"
 
     - trigger: QQ or fuzzy match on bmad-quick-dev-new-preview
diff --git a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-01-mode-detection.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-01-mode-detection.md
index b568270ab..8de9be3fd 100644
--- a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-01-mode-detection.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-01-mode-detection.md
@@ -50,7 +50,7 @@ Analyze the user's input to determine mode:
 - Load the spec, extract tasks/context/AC
 - Set `{execution_mode}` = "tech-spec"
 - Set `{tech_spec_path}` = provided path
-- **NEXT:** Read fully and follow: `./steps/step-03-execute.md`
+- **NEXT:** Read fully and follow: `{nextStepFile_modeA}`
 
 **Mode B: Direct Instructions**
 
@@ -91,7 +91,7 @@ Display: "**Select:** [P] Plan first (tech-spec) [E] Execute directly"
 #### Menu Handling Logic:
 
 - IF P: Direct user to `{quick_spec_workflow}`. **EXIT Quick Dev.**
-- IF E: Ask for any additional guidance, then **NEXT:** Read fully and follow: `./steps/step-02-context-gathering.md`
+- IF E: Ask for any additional guidance, then **NEXT:** Read fully and follow: `{nextStepFile_modeB}`
 
 #### EXECUTION RULES:
 
@@ -114,7 +114,7 @@ Display:
 
 - IF P: Direct to `{quick_spec_workflow}`. **EXIT Quick Dev.**
 - IF W: Direct user to run the PRD workflow instead. **EXIT Quick Dev.**
-- IF E: Ask for guidance, then **NEXT:** Read fully and follow: `./steps/step-02-context-gathering.md`
+- IF E: Ask for guidance, then **NEXT:** Read fully and follow: `{nextStepFile_modeB}`
 
 #### EXECUTION RULES:
 
@@ -137,7 +137,7 @@ Display:
 
 - IF P: Direct to `{quick_spec_workflow}`. **EXIT Quick Dev.**
 - IF W: Direct user to run the PRD workflow instead. **EXIT Quick Dev.**
-- IF E: Ask for guidance, then **NEXT:** Read fully and follow: `./steps/step-02-context-gathering.md`
+- IF E: Ask for guidance, then **NEXT:** Read fully and follow: `{nextStepFile_modeB}`
 
 #### EXECUTION RULES:
 
@@ -150,8 +150,8 @@ Display:
 
 **CRITICAL:** When this step completes, explicitly state which step to load:
 
-- Mode A (tech-spec): "**NEXT:** read fully and follow: `./steps/step-03-execute.md`"
-- Mode B (direct, [E] selected): "**NEXT:** Read fully and follow: `./steps/step-02-context-gathering.md`"
+- Mode A (tech-spec): "**NEXT:** read fully and follow: `{nextStepFile_modeA}`"
+- Mode B (direct, [E] selected): "**NEXT:** Read fully and follow: `{nextStepFile_modeB}`"
 - Escalation ([P] or [W]): "**EXITING Quick Dev.** Follow the directed workflow."
 
 ---
diff --git a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-02-context-gathering.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-02-context-gathering.md
index fd6ed2254..3652bb924 100644
--- a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-02-context-gathering.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-02-context-gathering.md
@@ -97,7 +97,7 @@ Ready to execute? (y/n/adjust)
 
 **CRITICAL:** When user confirms ready, explicitly state:
 
-- **y:** "**NEXT:** Read fully and follow: `./steps/step-03-execute.md`"
+- **y:** "**NEXT:** Read fully and follow: `{nextStepFile}`"
 - **n/adjust:** Continue gathering context, then re-present plan
 
 ---
diff --git a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-03-execute.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-03-execute.md
index dca4ebaa4..06801af7a 100644
--- a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-03-execute.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-03-execute.md
@@ -89,7 +89,7 @@ For each task:
 
 ## NEXT STEP
 
-When ALL tasks are complete (or halted on blocker), read fully and follow: `./steps/step-04-self-check.md`.
+When ALL tasks are complete (or halted on blocker), read fully and follow: `{nextStepFile}`.
 
 ---
 
diff --git a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-04-self-check.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-04-self-check.md
index 73ecc8e2a..e70de8515 100644
--- a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-04-self-check.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-04-self-check.md
@@ -89,7 +89,7 @@ Proceeding to adversarial code review...
 
 ## NEXT STEP
 
-Proceed immediately to `./steps/step-05-adversarial-review.md`.
+Proceed immediately to `{nextStepFile}`.
 
 ---
 
diff --git a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-05-adversarial-review.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-05-adversarial-review.md
index 29ece7c2c..29a0cef19 100644
--- a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-05-adversarial-review.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/steps/step-05-adversarial-review.md
@@ -77,7 +77,7 @@ If TodoWrite or similar tool is available, turn each finding into a TODO, includ
 
 ## NEXT STEP
 
-With findings in hand, read fully and follow: `./steps/step-06-resolve-findings.md` for user to choose resolution approach.
+With findings in hand, read fully and follow: `{nextStepFile}` for user to choose resolution approach.
 
 ---
 
diff --git a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/workflow.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/workflow.md
index b870aaa3d..936bee699 100644
--- a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/workflow.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/workflow.md
@@ -39,7 +39,7 @@ Load config from `{project-root}/_bmad/bmm/config.yaml` and resolve:
 
 ### Related Workflows
 
-- `quick_spec_workflow` = `{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec/workflow.md`
+- `quick_spec_workflow` = `../quick-spec/workflow.md`
 - `party_mode_exec` = `{project-root}/_bmad/core/workflows/bmad-party-mode/workflow.md`
 - `advanced_elicitation` = `skill:bmad-advanced-elicitation`