diff --git a/FURPS.md b/FURPS.md
index 39b3bbb5..ddf6f1c 100644
--- a/FURPS.md
+++ b/FURPS.md
@@ -36,8 +36,8 @@
 
 #### Supportability
 
-1. nwaku as service node
-2. js-waku as edge node
+1. Linux amd64 CLI as service node
+2. Browser as client
 
 ### Store
 
@@ -61,7 +61,8 @@
 #### Reliability
 
 1. Implements DoS protection through request rate limitation.
-2. (limitation) No guarantees in terms of message presence or retention duration
+2. (limitation) No guarantees in terms of message presence or retention duration.
+3. Store node always provide a response; thanks to DoS protection.
 
 #### Performance
 
@@ -74,6 +75,6 @@
 
 #### Supportability
 
-1. nwaku support as service node.
-2. Uses PostgreSQL as database engine.
-3. Browser support (js-waku) as client.
\ No newline at end of file
+1. Linux amd64 CLI as service node
+2. PostgreSQL as database engine.
+3. Browser support as client.
\ No newline at end of file
diff --git a/ROADMAP.md b/ROADMAP.md
index 8c852a8..8ecccda 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -31,12 +31,12 @@ Limited effort will be spent on store performance as its relevance is expected t
 **Feature**: Light Push
 
 **FURPS**:
-- F4: Supports comprehensive error codes for various failure scenarios.
-- U4: Provides descriptive error messages in responses.
-- R3: Status codes indicate the best recovery method (retry, discard service node or irrecoverable failure).
-- R4: 80% message transmission success rate on live Status network (service node from both Status Desktop and fleet Waku instances)
+- F4. Supports comprehensive error codes for various failure scenarios.
+- U4. Provides descriptive error messages in responses.
+- R3. Status codes indicate the best recovery method (retry, discard service node or irrecoverable failure).
+- R4. 80% message transmission success rate on live Status network (service node from both Status Desktop and fleet Waku instances)
 
-For S1: nwaku as service node
+For S1. Linux amd64 CLI as service node
 Includes spec delivery
 
 #### Implement Light Push Error codes in The Browser
@@ -46,11 +46,11 @@ Includes spec delivery
 **Feature**: Light Push
 
 **FURPS**:
-- F4: Supports comprehensive error codes for various failure scenarios.
-- U4: Provides descriptive error messages in responses.
-- R3: Status codes indicate the best recovery method (retry, discard service node or irrecoverable failure).
+- F4. Supports comprehensive error codes for various failure scenarios.
+- U4. Provides descriptive error messages in responses.
+- R3. Status codes indicate the best recovery method (retry, discard service node or irrecoverable failure).
 
-For S2: js-waku as edge node
+For S2. Browser as client
 Spec delivery not included.
 
 #### PostgreSQL Optimisation Phase 1
@@ -60,11 +60,13 @@ Spec delivery not included.
 **Feature**: Store
 
 **FURPS**:
-- F6: Industry practices are applied to PostgreSQL setup to reach appropriate performance
-- P5:️ Hash query of less than 10 hashes are served under 400ms; for a database less than 250 GB size and average message size under 500KiB **(Vac-DST)**.
-- P6:️ Time range queries of less than 24 hours, with less than 10 content topics, are served under 400 ms; for a database less than 250 GB size and average message size under 500KiB **(Vac-DST)**.
+- F6. Industry practices are applied to PostgreSQL setup to reach appropriate performance
+- P5. Hash query of less than 10 hashes are served under 400ms; for a database less than 250 GB size and average message size under 500KiB **(Vac-DST)**.
+- P6. Time range queries of less than 24 hours, with less than 10 content topics, are served under 400 ms; for a database less than 250 GB size and average message size under 500KiB **(Vac-DST)**.
 
-For S1: nwaku support as service node.
+For
+- S1. Linux amd64 CLI as service node; and
+- S2. PostgreSQL as database engine.
 
 #### P2P Reliability Implementation in the Browser