diff --git a/content/waku/2024-milestones.md b/content/waku/2024-milestones.md
deleted file mode 100644
index 6336e13c2..000000000
--- a/content/waku/2024-milestones.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: 2024 Milestones
-date: 2024-06-04
----
-
-- [Store Service Upgrade](waku/milestones/2024-bandwidth-optimization-and-protocol-review.md)
-- [Direct Message Reliability](waku/milestones/2024-direct-msg-reliability.md)
-- [End-to-end reliability protocol](waku/milestones/2024-e2e-reliability-protocol.md)
-- [Static Sharding - dedicated shards](waku/milestones/2024-static-sharding-dedicated-shards.md)
-- [Bandwidth optimization and protocol review](waku/milestones/2024-bandwidth-optimization-and-protocol-review.md)
-- [Scale up number of Communities](waku/milestones/2024-scale-number-of-communities.md)
-- [Nwaku in Status Desktop (Relay, *nix)](waku/milestones/2024-nwaku-in-status-desktop.md)
-- [RLN Mainnet](waku/milestones/2024-rln-mainnet.md)
diff --git a/content/waku/index.md b/content/waku/index.md
index 8a42ae1ab..d1e058980 100644
--- a/content/waku/index.md
+++ b/content/waku/index.md
@@ -9,9 +9,8 @@ lastmod: 2024-07-18
 ---
 ## Roadmap Overview
 To learn more about Waku please visit the [website](https://waku.org), [github](https://github.com/waku-org), and [docs](https://docs.waku.org).
-- [2024 Milestones](waku/2024-milestones.md)
+- [Milestones](waku/milestones.md)
 - [Weekly updates](tags/waku-updates)
 - [Process](waku/process.md)
 - [Reports](waku/reports.md)
 - [Collaboration](waku/collaboration)
-- [2023 Milestones](waku/2023-milestones.md)
diff --git a/content/waku/milestones.md b/content/waku/milestones.md
new file mode 100644
index 000000000..3c7948717
--- /dev/null
+++ b/content/waku/milestones.md
@@ -0,0 +1,27 @@
+---
+title: Milestones
+date: 2024-06-04
+---
+
+### Started in H2 2024
+
+- [Static Sharding - dedicated shards](waku/milestones/open/2024-static-sharding-dedicated-shards.md)
+- [Bandwidth optimization and protocol review](waku/milestones/open/2024-bandwidth-optimization-and-protocol-review.md)
+- [Scale up number of Communities](waku/milestones/open/2024-scale-number-of-communities.md)
+- [Nwaku in Status Desktop (Relay, *nix)](waku/milestones/open/2024-nwaku-in-status-desktop.md)
+- [RLN Mainnet](waku/milestones/open/2024-rln-mainnet.md)
+
+### Started in H1 2024
+
+- [Store Service Upgrade](waku/milestones/open/2024-bandwidth-optimization-and-protocol-review.md)
+- [Direct Message Reliability](waku/milestones/open/2024-direct-msg-reliability.md)
+- [End-to-end reliability protocol](waku/milestones/open/2024-e2e-reliability-protocol.md)
+- [Acquire first 10 Customers](waku/milestones/open/2024-acquire-first-10-customers.md)
+- [Desmonstrate Product Market-Fit](waku/milestones/open/2024-demonstrate-product-market-fit.md)
+
+### Closed
+
+- [Quality Assurance processes are in place](waku/milestones/closed/2023-quality-assurance-processes.md)
+- [Support 1 Million Users](waku/milestones/closed/2023-support-1-million-users.md)
+- [Support Many Platforms](waku/milestones/closed/2023-support-many-platforms.md)
+- [Waku Network Gen 0](content/waku/milestones/closed/2023-waku-network-gen-0.md)
diff --git a/content/waku/milestones/index.md b/content/waku/milestones/index.md
deleted file mode 100644
index 06f11f414..000000000
--- a/content/waku/milestones/index.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# 2024
-
-## Started in H2 
-
-- [Static Sharding - dedicated shards](waku/milestones/2024-static-sharding-dedicated-shards.md)
-- [Bandwidth optimization and protocol review](waku/milestones/2024-bandwidth-optimization-and-protocol-review.md)
-- [Scale up number of Communities](waku/milestones/2024-scale-number-of-communities.md)
-- [Nwaku in Status Desktop (Relay, *nix)](waku/milestones/2024-nwaku-in-status-desktop.md)
-- [RLN Mainnet](waku/milestones/2024-rln-mainnet.md)
-
-## Started H1
-
-- [Store Service Upgrade](waku/milestones/2024-bandwidth-optimization-and-protocol-review.md)
-- [Direct Message Reliability](waku/milestones/2024-direct-msg-reliability.md)
-- [End-to-end reliability protocol](waku/milestones/2024-e2e-reliability-protocol.md)
-
-# 2023
-
-See [2023 Milestones](../2023-milestones.md).
\ No newline at end of file
diff --git a/content/waku/milestones/open/acquire-first-10-customers.md b/content/waku/milestones/open/acquire-first-10-customers.md
deleted file mode 100644
index f5b33fd01..000000000
--- a/content/waku/milestones/open/acquire-first-10-customers.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-title: Acquire first 10 customers
-tags:
-    - waku-milestone
-date: 2024-09-07
----
-
-## Milestone: [Acquire first 10 Customers](https://github.com/waku-org/pm/milestone/37)
-
-Onboard Waku first 10 customers. Customers are projects using Waku for their peer-to-peer communication stack.
-First 10 customers assume involvement from the engineering team to get things right and help co-design.
-
-Status, Railgun, TheGraph and Portrait should count as the first four.
-
-### Deliverable: [5-10 Highly qualified leads](https://github.com/waku-org/pm/issues/254)
-
-Identify 5-10 leads that have strong chances to go with Waku:
-- How many recurring co-design meetings have been scheduled.
-- How many collaboration Discord bridges have been setup
-- Moved to the Solutioning column in IFT BD CRM.
-
-
-### Deliverable: [Review current integrations](https://github.com/waku-org/pm/issues/255)
-
-Organise monthly catch-up calls with Railgun, TheGraph, Portrait and any other integrated customers to review their usage of Waku. Discuss their current problems and future goals.
-
-Cover latest Waku development, including RLN mainnet contract parameters.
\ No newline at end of file