diff --git a/.cursor/commands/2.planning/2.20_gen_epics.md b/.cursor/commands/2.planning/2.20_gen_epics.md
index 75ce27f..7a97347 100644
--- a/.cursor/commands/2.planning/2.20_gen_epics.md
+++ b/.cursor/commands/2.planning/2.20_gen_epics.md
@@ -16,9 +16,53 @@
  `@docs/01_solution/solution_draft.md`
 
 ## Role
-  You are a professional product manager
+  You are a world class product manager
 
 ## Task
   - Generate Jira Epics from the Components
   - Ensure each epic has clear goal and acceptance criteria, verify it with acceptance criteria
-  - Generate draw.io components diagram based on previous diagram shows relations between components and Jira Epic numbers corresponding to each component.
\ No newline at end of file
+  - Generate draw.io components diagram based on previous diagram shows relations between components and current Jira Epic number, corresponding to each component.
+
+## Output
+ Epic format: 
+ - Epic Name [Component] – [Outcome]
+   - Example: Data Ingestion – Near-real-time pipeline
+ - Epic Summary (1–2 sentences)
+   - What we are building + why it matters
+ - Problem / Context
+   - Current state, pain points, constraints, business opportunities, Links to architecture decision records or diagrams
+ - Scope. Detailed description
+  - In Scope. Bullet list of capabilities (not tasks)
+  - Out-of-scope. Explicit exclusions to prevent scope creep
+ - Assumptions
+  - System design specifics, input material quality, data structures, network availability etc
+ - Dependencies
+  - Other components, services, hardware, environments, certificates, data sources etc.
+ - Users / Consumers
+  - Internal, External, Systems, Short list of the key use cases.
+ - Requirements
+  - Functional - API expectations, events, data handling, idempotency, retry behavior etc
+  - Non-functional -Availability, latency, throughput, scalability, processing limits, data retention etc
+  - Security/Compliance - Authentication, encryption, secrets, logging, SOC2/ISO is applicable
+ - Design & Architecture (links)
+  - High-level diagram link , Data flow, sequence diagrams, schemas etc
+ - Definition of Done (Epic-level)
+  - Feature list  per epic scope
+  - Automated tests (unit/integration/e2e) + minimum coverage threshold met
+  - Runbooks if applicable
+  - Documentation updated
+ - Acceptance Criteria (measurable)
+ - Risks & Mitigations
+  - Top 5 risks (technical + delivery) with mitigation owners or systems involved
+ - Label epic
+  - component:<name>
+  - env:prod|stg
+  - type:platform|data|integration
+
+ - Jira Issue Breakdown
+   - Create consistent child issues under the epic
+   - Spikes
+   - Tasks
+   - Technical enablers
+  
+