diff --git a/src/bmm/agents/analyst.agent.yaml b/src/bmm/agents/analyst.agent.yaml
index 3bfb02d8a..70626e7af 100644
--- a/src/bmm/agents/analyst.agent.yaml
+++ b/src/bmm/agents/analyst.agent.yaml
@@ -35,7 +35,7 @@ agent:
       description: "[TR] Technical Research: Technical feasibility, architecture options and implementation approaches"
 
     - trigger: CB or fuzzy match on product-brief
-      exec: "{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/workflow.md"
+      exec: "{project-root}/_bmad/bmm/workflows/1-analysis/bmad-create-product-brief/workflow.md"
       description: "[CB] Create Brief: A guided experience to nail down your product idea into an executive brief"
 
     - trigger: DP or fuzzy match on document-project
diff --git a/src/bmm/module-help.csv b/src/bmm/module-help.csv
index 7b253a574..2d89b41e1 100644
--- a/src/bmm/module-help.csv
+++ b/src/bmm/module-help.csv
@@ -14,7 +14,7 @@ bmm,1-analysis,Brainstorm Project,BP,10,skill:bmad-brainstorming,bmad-brainstorm
 bmm,1-analysis,Market Research,MR,20,_bmad/bmm/workflows/1-analysis/research/workflow-market-research.md,bmad-bmm-market-research,false,analyst,Create Mode,"Market analysis competitive landscape customer needs and trends","planning_artifacts|project-knowledge","research documents",
 bmm,1-analysis,Domain Research,DR,21,skill:bmad-domain-research,bmad-bmm-domain-research,false,analyst,Create Mode,"Industry domain deep dive subject matter expertise and terminology","planning_artifacts|project_knowledge","research documents",
 bmm,1-analysis,Technical Research,TR,22,_bmad/bmm/workflows/1-analysis/research/workflow-technical-research.md,bmad-bmm-technical-research,false,analyst,Create Mode,"Technical feasibility architecture options and implementation approaches","planning_artifacts|project_knowledge","research documents",
-bmm,1-analysis,Create Brief,CB,30,_bmad/bmm/workflows/1-analysis/create-product-brief/workflow.md,bmad-bmm-create-product-brief,false,analyst,Create Mode,"A guided experience to nail down your product idea",planning_artifacts,"product brief",
+bmm,1-analysis,Create Brief,CB,30,skill:bmad-create-product-brief,bmad-bmm-create-product-brief,false,analyst,Create Mode,"A guided experience to nail down your product idea",planning_artifacts,"product brief",
 bmm,2-planning,Create PRD,CP,10,_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow-create-prd.md,bmad-bmm-create-prd,true,pm,Create Mode,"Expert led facilitation to produce your Product Requirements Document",planning_artifacts,prd,
 bmm,2-planning,Validate PRD,VP,20,_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow-validate-prd.md,bmad-bmm-validate-prd,false,pm,Validate Mode,"Validate PRD is comprehensive lean well organized and cohesive",planning_artifacts,"prd validation report",
 bmm,2-planning,Edit PRD,EP,25,_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow-edit-prd.md,bmad-bmm-edit-prd,false,pm,Edit Mode,"Improve and enhance an existing PRD",planning_artifacts,"updated prd",
diff --git a/src/bmm/workflows/1-analysis/bmad-create-product-brief/SKILL.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/SKILL.md
new file mode 100644
index 000000000..4ef96c650
--- /dev/null
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: bmad-create-product-brief
+description: 'Create product brief through collaborative discovery. Use when the user says "lets create a product brief" or "help me create a project brief"'
+---
+
+Follow the instructions in [workflow.md](workflow.md).
diff --git a/src/bmm/workflows/1-analysis/bmad-create-product-brief/bmad-skill-manifest.yaml b/src/bmm/workflows/1-analysis/bmad-create-product-brief/bmad-skill-manifest.yaml
new file mode 100644
index 000000000..d0f08abdb
--- /dev/null
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/bmad-skill-manifest.yaml
@@ -0,0 +1 @@
+type: skill
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/product-brief.template.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/product-brief.template.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/create-product-brief/product-brief.template.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/product-brief.template.md
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-01-init.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01-init.md
similarity index 96%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-01-init.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01-init.md
index 0046af0cc..5fd8906da 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-01-init.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01-init.md
@@ -3,7 +3,7 @@ name: 'step-01-init'
 description: 'Initialize the product brief workflow by detecting continuation state and setting up the document'
 
 # File References
-nextStepFile: '{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-02-vision.md'
+nextStepFile: './steps/step-02-vision.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Template References
@@ -73,7 +73,7 @@ If the document exists and has frontmatter with `stepsCompleted`:
 
 **Continuation Protocol:**
 
-- **STOP immediately** and load `{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-01b-continue.md`
+- **STOP immediately** and load `./steps/step-01b-continue.md`
 - Do not proceed with any initialization tasks
 - Let step-01b handle all continuation logic
 - This is an auto-proceed situation - no user choice needed
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-01b-continue.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01b-continue.md
similarity index 93%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-01b-continue.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01b-continue.md
index bedcfc913..19d145262 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-01b-continue.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01b-continue.md
@@ -95,9 +95,9 @@ Does this look right, or do you want to make any adjustments before we proceed?"
 **Next Step Logic:**
 Based on `lastStep` value, determine which step to load next:
 
-- If `lastStep = 1` → Load `{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-02-vision.md`
-- If `lastStep = 2` → Load `{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-03-users.md`
-- If `lastStep = 3` → Load `{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-04-metrics.md`
+- If `lastStep = 1` → Load `./steps/step-02-vision.md`
+- If `lastStep = 2` → Load `./steps/step-03-users.md`
+- If `lastStep = 3` → Load `./steps/step-04-metrics.md`
 - Continue this pattern for all steps
 - If `lastStep = 6` → Workflow already complete
 
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-02-vision.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-02-vision.md
similarity index 98%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-02-vision.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-02-vision.md
index bcdb0d877..a8bb7c87d 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-02-vision.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-02-vision.md
@@ -3,7 +3,7 @@ name: 'step-02-vision'
 description: 'Discover and define the core product vision, problem statement, and unique value proposition'
 
 # File References
-nextStepFile: '{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-03-users.md'
+nextStepFile: './steps/step-03-users.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Task References
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-03-users.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-03-users.md
similarity index 98%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-03-users.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-03-users.md
index d2f68ea51..414e0bbdd 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-03-users.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-03-users.md
@@ -3,7 +3,7 @@ name: 'step-03-users'
 description: 'Define target users with rich personas and map their key interactions with the product'
 
 # File References
-nextStepFile: '{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-04-metrics.md'
+nextStepFile: './steps/step-04-metrics.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Task References
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-04-metrics.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-04-metrics.md
similarity index 98%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-04-metrics.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-04-metrics.md
index 8ad4bd46a..8273b649c 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-04-metrics.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-04-metrics.md
@@ -3,7 +3,7 @@ name: 'step-04-metrics'
 description: 'Define comprehensive success metrics that include user success, business objectives, and key performance indicators'
 
 # File References
-nextStepFile: '{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-05-scope.md'
+nextStepFile: './steps/step-05-scope.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Task References
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-05-scope.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-05-scope.md
similarity index 98%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-05-scope.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-05-scope.md
index a8d70e76b..af83f508f 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-05-scope.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-05-scope.md
@@ -3,7 +3,7 @@ name: 'step-05-scope'
 description: 'Define MVP scope with clear boundaries and outline future vision while managing scope creep'
 
 # File References
-nextStepFile: '{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-06-complete.md'
+nextStepFile: './steps/step-06-complete.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Task References
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/steps/step-06-complete.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-06-complete.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/create-product-brief/steps/step-06-complete.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-06-complete.md
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/workflow.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/workflow.md
similarity index 94%
rename from src/bmm/workflows/1-analysis/create-product-brief/workflow.md
rename to src/bmm/workflows/1-analysis/bmad-create-product-brief/workflow.md
index c50d325ef..99182ca0e 100644
--- a/src/bmm/workflows/1-analysis/create-product-brief/workflow.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/workflow.md
@@ -1,5 +1,5 @@
 ---
-name: create-product-brief
+name: bmad-create-product-brief
 description: 'Create product brief through collaborative discovery. Use when the user says "lets create a product brief" or "help me create a project brief"'
 ---
 
@@ -54,4 +54,4 @@ Load and read full config from {project-root}/_bmad/bmm/config.yaml and resolve:
 
 ### 2. First Step EXECUTION
 
-Read fully and follow: `{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/steps/step-01-init.md` to begin the workflow.
+Read fully and follow: `./steps/step-01-init.md` to begin the workflow.
diff --git a/src/bmm/workflows/1-analysis/create-product-brief/bmad-skill-manifest.yaml b/src/bmm/workflows/1-analysis/create-product-brief/bmad-skill-manifest.yaml
deleted file mode 100644
index cb3969a6e..000000000
--- a/src/bmm/workflows/1-analysis/create-product-brief/bmad-skill-manifest.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-canonicalId: bmad-create-product-brief
-type: workflow
-description: "Create product brief through collaborative discovery"