diff --git a/README.md b/README.md
index f5adec0..9dd9d7b 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,13 @@ It's a free web application to manage software tests. It's mainly intended for h
 
 It allows you to define:
 
-- what you want to test (we call it test cases);
-- how you expect your software works in different scenarios (tests);
-- for each test, you can describe all the steps required to run it.
+- what you want to test (we call it **test cases**);
+- how you expect your software works in different scenarios (**tests**);
+- for each test, you can describe all the **steps** required to run it.
 
-You can also organize your tests using tags.
+You can also organize your tests using **tags**.
 
-Then you can manage test sessions, sunning tests and tracking success and failures, adding comments, assigning tasks and much more.
+Then you can manage test sessions, running tests and tracking success and failures, adding comments, assigning tasks and much more.
 
 At any time, you can monitor progress and evaluate problems.
 
diff --git a/ROADMAP.md b/ROADMAP.md
index 8cbf611..8a4e2f6 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,11 +1,85 @@
-# Roadmap
+# yTestbook Technical Roadmap
 
-WIP
+## Overview
 
-yTestbook is currently in design phase, we are working on defining and prioritizine features, using a design-thinking approach.
+This roadmap outlines the development phases for yTestbook, focusing on delivering a robust, privacy-focused, and collaborative test management platform.
 
-For sure, we'll deliver an useful set of features to allow user to:
+---
+
+## Phase 1: Current Phase - Client Application Finalization (Q4 2025)
+
+**Status**: In Progress
+
+### Objectives
+- Stabilize core functionality
+- Prepare for comprehensive testing
+
+### Key Deliverables
+- ✓ Core CRUD operations for testbooks, test cases, tests, and steps
+- ✓ Session management and test execution tracking
+- ✓ Tag-based organization system
+- ✓ Comments and collaboration features
+- ✓ Export data (json)
+- ✓ Responsive UI with modern design (Mantine components)
+- Final UI/UX refinements
+- Performance optimization
+- Bug fixes and edge case handling
+- Improve the test suite
+
+### Technical Focus
+- React + TypeScript frontend
+- Client-side data persistence
+- File-based data model (JSON)
+- Progressive Web App (PWA) capabilities
+
+---
+
+## Phase 2: Reports & Server-Side Development (Q1-Q3 2026)
+
+**Status**: Upcoming
+
+### Objectives
+- Add meaningful reports for each testbook (upgrading the actual "report" page)
+- Build robust backend infrastructure
+- Enable multi-user collaboration
+- Implement privacy and security controls
+- Provide centralized data storage
+
+### 2.1 Backend Architecture
+
+#### Technology Stack
+- **Server application**: Node.js + automerge
+- **Database**: PostgreSQL
+
+---
+
+## Phase 3: AI Integration (Q3-Q4 2026)
+
+**Status**: Planned
+
+### Objectives
+- Simplify building testbooks from technical analysis, allowing users to focus on test execution
+
+### Key Deliverables
+- Implement an offline tool for scaffolding testbooks, powered by AI
+
+---
+
+## Release Strategy
+
+### Versioning
+- **v1.0** - Standalone client application (Current)
+- **v1.5** - Tested and stabilized client, with reports (Q2 2026)
+- **v2.0** - Server-backed application with basic collaboration (Q3 2026)
+- **v2.5** - IA integration (Q4 2026)
+
+---
+
+## Get Involved
+
+This roadmap is a living document. We welcome:
+- Feature requests and feedback
+- Beta testing participation
+- Community contributions
+- Integration partnerships
 
-- [ ] define test specs
-- [ ] track test execution
-- [ ] monitor test status and progress