diff --git a/src/bmm/workflows/1-analysis/bmad-product-brief-preview/SKILL.md b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/SKILL.md
index 3d0a87b3d..adeda50f7 100644
--- a/src/bmm/workflows/1-analysis/bmad-product-brief-preview/SKILL.md
+++ b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/SKILL.md
@@ -84,5 +84,5 @@ Check activation context immediately:
 
 ## External Skills
 
-This workflow may invoke:
-- `bmad-init` — Invoke for configuration loading (module: bmm)
+This workflow uses:
+- `bmad-init` — Configuration loading (module: bmm)
diff --git a/src/bmm/workflows/3-solutioning/bmad-create-architecture/steps/step-01-init.md b/src/bmm/workflows/3-solutioning/bmad-create-architecture/steps/step-01-init.md
index 00ea5c205..c2933dfb8 100644
--- a/src/bmm/workflows/3-solutioning/bmad-create-architecture/steps/step-01-init.md
+++ b/src/bmm/workflows/3-solutioning/bmad-create-architecture/steps/step-01-init.md
@@ -112,13 +112,13 @@ Report what was found:
 
 **Documents Found:**
 
-- PRD: {{number_of_prd_files_loaded_or_none}}
-- UX Design: {{number_of_ux_files_loaded_or_none}}
-- Research: {{number_of_research_files_loaded_or_none}}
-- Project docs: {{number_of_project_files_loaded_or_none}}
-- Project context: {{project_context_rules_count}}
+- PRD: {number of PRD files loaded or "None found - REQUIRED"}
+- UX Design: {number of UX files loaded or "None found"}
+- Research: {number of research files loaded or "None found"}
+- Project docs: {number of project files loaded or "None found"}
+- Project context: {project_context_rules count of rules for AI agents found}
 
-**Files loaded:** {{list_of_loaded_file_names}}
+**Files loaded:** {list of specific file names or "No additional documents found"}
 
 Ready to begin architectural decision making. Do you have any other documents you'd like me to include?
 
diff --git a/src/bmm/workflows/3-solutioning/bmad-create-architecture/steps/step-01b-continue.md b/src/bmm/workflows/3-solutioning/bmad-create-architecture/steps/step-01b-continue.md
index d7e1d14fe..977896afc 100644
--- a/src/bmm/workflows/3-solutioning/bmad-create-architecture/steps/step-01b-continue.md
+++ b/src/bmm/workflows/3-solutioning/bmad-create-architecture/steps/step-01b-continue.md
@@ -64,13 +64,13 @@ Show the user their current progress:
 - Input documents loaded: {{number of inputDocuments}} files
 
 **Document Sections Found:**
-{{list_of_h2_h3_sections_found_in_document}}
+{list all H2/H3 sections found in the document}
 
-{{if_incomplete_sections}}
+{if_incomplete_sections}
 **Incomplete Areas:**
 
-- {{areas_that_appear_incomplete_or_have_placeholders}}
-  {{/if_incomplete_sections}}
+- {areas that appear incomplete or have placeholders}
+  {/if_incomplete_sections}
 
 **What would you like to do?**
 [R] Resume from where we left off
diff --git a/src/bmm/workflows/3-solutioning/bmad-create-architecture/steps/step-02-context.md b/src/bmm/workflows/3-solutioning/bmad-create-architecture/steps/step-02-context.md
index 5ccffdc87..96cb5c4e1 100644
--- a/src/bmm/workflows/3-solutioning/bmad-create-architecture/steps/step-02-context.md
+++ b/src/bmm/workflows/3-solutioning/bmad-create-architecture/steps/step-02-context.md
@@ -96,15 +96,15 @@ Present your analysis back to user for validation:
 
 "I'm reviewing your project documentation for {{project_name}}.
 
-{{if_epics_loaded}}I see {{epic_count}} epics with {{story_count}} total stories.{{/if_epics_loaded}}
-{{if_no_epics}}I found {{fr_count}} functional requirements organized into {{fr_category_list}}.{{/if_no_epics}}
-{{if_ux_loaded}}I also found your UX specification which defines the user experience requirements.{{/if_ux_loaded}}
+{if_epics_loaded}I see {{epic_count}} epics with {{story_count}} total stories.{/if_epics_loaded}
+{if_no_epics}I found {{fr_count}} functional requirements organized into {{fr_category_list}}.{/if_no_epics}
+{if_ux_loaded}I also found your UX specification which defines the user experience requirements.{/if_ux_loaded}
 
 **Key architectural aspects I notice:**
 
 - [Summarize core functionality from FRs]
 - [Note critical NFRs that will shape architecture]
-- {{if_ux_loaded}}[Note UX complexity and technical requirements]{{/if_ux_loaded}}
+- {if_ux_loaded}[Note UX complexity and technical requirements]{/if_ux_loaded}
 - [Identify unique technical challenges or constraints]
 - [Highlight any regulatory or compliance requirements]
 
diff --git a/src/bmm/workflows/3-solutioning/bmad-create-epics-and-stories/steps/step-03-create-stories.md b/src/bmm/workflows/3-solutioning/bmad-create-epics-and-stories/steps/step-03-create-stories.md
index 5c17a5dc5..14caafeb3 100644
--- a/src/bmm/workflows/3-solutioning/bmad-create-epics-and-stories/steps/step-03-create-stories.md
+++ b/src/bmm/workflows/3-solutioning/bmad-create-epics-and-stories/steps/step-03-create-stories.md
@@ -79,18 +79,18 @@ Stories must be independently completable in sequence:
 **STORY FORMAT (from template):**
 
 ```
-### Story {{N}}.{{M}}: {{story_title}}
+### Story {N}.{M}: {story_title}
 
-As a {{user_type}},
-I want {{capability}},
-So that {{value_benefit}}.
+As a {user_type},
+I want {capability},
+So that {value_benefit}.
 
 **Acceptance Criteria:**
 
-**Given** {{precondition}}
-**When** {{action}}
-**Then** {{expected_outcome}}
-**And** {{additional_criteria}}
+**Given** {precondition}
+**When** {action}
+**Then** {expected_outcome}
+**And** {additional_criteria}
 ```
 
 **✅ GOOD STORY EXAMPLES:**