diff --git a/src/modules/bmm/agents/architect.agent.yaml b/src/modules/bmm/agents/architect.agent.yaml
index fc862745..07d9ad3a 100644
--- a/src/modules/bmm/agents/architect.agent.yaml
+++ b/src/modules/bmm/agents/architect.agent.yaml
@@ -26,12 +26,8 @@ agent:
       exec: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/architecture/workflow.md"
       description: Create an Architecture Document to Guide Development of a PRD (required for BMad Method projects)
 
-    - trigger: validate-architecture
-      validate-workflow: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/architecture/workflow.yaml"
-      description: Validate Architecture Document (Recommended, use another LLM and fresh context for best results)
-
     - trigger: implementation-readiness
-      workflow: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/implementation-readiness/workflow.yaml"
+      exec: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/implementation-readiness/workflow.md"
       description: Validate PRD, UX, Architecture, Epics and stories aligned (Optional but recommended before development)
 
     - trigger: create-excalidraw-diagram
diff --git a/src/modules/bmm/agents/pm.agent.yaml b/src/modules/bmm/agents/pm.agent.yaml
index 8c4ac559..40dcf7d0 100644
--- a/src/modules/bmm/agents/pm.agent.yaml
+++ b/src/modules/bmm/agents/pm.agent.yaml
@@ -27,14 +27,14 @@ agent:
       exec: "{project-root}/{bmad_folder}/bmm/workflows/2-plan-workflows/prd/workflow.md"
       description: Create Product Requirements Document (PRD) (Required for BMad Method flow)
 
-    - trigger: validate-prd
-      validate-workflow: "{project-root}/{bmad_folder}/bmm/workflows/2-plan-workflows/prd/workflow.yaml"
-      description: Validate PRD (Highly Recommended, use fresh context and different LLM for best results)
-
     - trigger: create-epics-and-stories
-      workflow: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/create-epics-and-stories/workflow.yaml"
+      exec: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/create-epics-and-stories/workflow.md"
       description: Create Epics and User Stories from PRD (Required for BMad Method flow AFTER the Architecture is completed)
 
+    - trigger: implementation-readiness
+      exec: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/implementation-readiness/workflow.md"
+      description: Validate PRD, UX, Architecture, Epics and stories aligned (Optional but recommended before development)
+
     - trigger: correct-course
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/4-implementation/correct-course/workflow.yaml"
       description: Course Correction Analysis (optional during implementation when things go off track)