diff --git a/src/bmm/workflows/qa-generate-e2e-tests/instructions.md b/src/bmm/workflows/qa-generate-e2e-tests/workflow.md
similarity index 61%
rename from src/bmm/workflows/qa-generate-e2e-tests/instructions.md
rename to src/bmm/workflows/qa-generate-e2e-tests/workflow.md
index 03653337f..f911090b0 100644
--- a/src/bmm/workflows/qa-generate-e2e-tests/instructions.md
+++ b/src/bmm/workflows/qa-generate-e2e-tests/workflow.md
@@ -1,10 +1,43 @@
-# Quinn QA - Automate
+---
+name: qa-generate-e2e-tests
+description: 'Generate end to end automated tests for existing features. Use when the user says "create qa automated tests for [feature]"'
+---
 
-**Goal**: Generate automated API and E2E tests for implemented code.
+# QA Generate E2E Tests Workflow
 
-**Scope**: This workflow generates tests ONLY. It does **not** perform code review or story validation (use Code Review `CR` for that).
+**Goal:** Generate automated API and E2E tests for implemented code.
 
-## Instructions
+**Your Role:** You are a QA automation engineer. You generate tests ONLY — no code review or story validation (use Code Review `CR` for that).
+
+---
+
+## INITIALIZATION
+
+### Configuration Loading
+
+Load config from `{project-root}/_bmad/bmm/config.yaml` and resolve:
+
+- `project_name`, `user_name`
+- `communication_language`, `document_output_language`
+- `implementation_artifacts`
+- `date` as system-generated current datetime
+- YOU MUST ALWAYS SPEAK OUTPUT in your Agent communication style with the config `{communication_language}`
+
+### Paths
+
+- `installed_path` = `{project-root}/_bmad/bmm/workflows/qa-generate-e2e-tests`
+- `checklist` = `{installed_path}/checklist.md`
+- `test_dir` = `{project-root}/tests`
+- `source_dir` = `{project-root}`
+- `default_output_file` = `{implementation_artifacts}/tests/test-summary.md`
+
+### Context
+
+- `project_context` = `**/project-context.md` (load if exists)
+
+---
+
+## EXECUTION
 
 ### Step 0: Detect Test Framework
 
@@ -101,10 +134,10 @@ If the project needs:
 - Comprehensive coverage analysis
 - Advanced testing patterns and utilities
 
-→ **Install Test Architect (TEA) module**: <https://bmad-code-org.github.io/bmad-method-test-architecture-enterprise/>
+> **Install Test Architect (TEA) module**: <https://bmad-code-org.github.io/bmad-method-test-architecture-enterprise/>
 
 ## Output
 
-Save summary to: `{implementation_artifacts}/tests/test-summary.md`
+Save summary to: `{default_output_file}`
 
-**Done!** Tests generated and verified.
+**Done!** Tests generated and verified. Validate against `{checklist}`.
diff --git a/src/bmm/workflows/qa-generate-e2e-tests/workflow.yaml b/src/bmm/workflows/qa-generate-e2e-tests/workflow.yaml
deleted file mode 100644
index 77809ff72..000000000
--- a/src/bmm/workflows/qa-generate-e2e-tests/workflow.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: qa-generate-e2e-tests
-description: 'Generate end to end automated tests for existing features. Use when the user says "create qa automated tests for [feature]"'
-
-# Critical variables from config
-config_source: "{project-root}/_bmad/bmm/config.yaml"
-implementation_artifacts: "{config_source}:implementation_artifacts"
-user_name: "{config_source}:user_name"
-communication_language: "{config_source}:communication_language"
-document_output_language: "{config_source}:document_output_language"
-date: system-generated
-
-# Workflow components
-installed_path: "{project-root}/_bmad/bmm/workflows/qa-generate-e2e-tests"
-instructions: "{installed_path}/instructions.md"
-validation: "{installed_path}/checklist.md"
-template: false
-
-# Variables and inputs
-test_dir: "{project-root}/tests" # Root test directory
-source_dir: "{project-root}" # Source code directory
-
-# Output configuration
-default_output_file: "{implementation_artifacts}/tests/test-summary.md"
-
-# Required tools
-required_tools:
-  - read_file # Read source code and existing tests
-  - write_file # Create test files
-  - create_directory # Create test directories
-  - list_files # Discover features
-  - search_repo # Find patterns
-  - glob # Find files
-
-tags:
-  - qa
-  - automation
-  - testing
-
-execution_hints:
-  interactive: false
-  autonomous: true
-  iterative: false