diff --git a/draft-roadmap/create_chat_sdk_mvp.md b/draft-roadmap/create_chat_sdk_mvp.md
index e7c0e75..99112cb 100644
--- a/draft-roadmap/create_chat_sdk_mvp.md
+++ b/draft-roadmap/create_chat_sdk_mvp.md
@@ -42,7 +42,7 @@ Logos Movement Module Build Out
 
 ## Deliverables
 
-### ChatSDK Developer Preview
+### [ChatSDK Developer Preview](https://github.com/waku-org/pm/issues/316)
 
 **Owner**: App/Chat Research
 
@@ -76,7 +76,7 @@ Logos Movement Module Build Out
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### ChatSDK Bindings
+### [ChatSDK Bindings](https://github.com/waku-org/pm/issues/317)
 
 **Owner**: App/Chat Dev
 
@@ -98,7 +98,7 @@ For library ChatSDK:
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.orgAPI definition? (TBD)
 
-### Create Segmentation Library
+### [Create Segmentation Library](https://github.com/waku-org/pm/issues/318)
 
 **Owner**: App/Chat Dev
 
@@ -130,7 +130,7 @@ For library ChatSDK:
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Create Rate Limit Manager
+### [Create Rate Limit Manager](https://github.com/waku-org/pm/issues/319)
 
 **Owner**: App/Chat Dev
 
diff --git a/draft-roadmap/extend_chat_sdk_with_group_conversations.md b/draft-roadmap/extend_chat_sdk_with_group_conversations.md
index cbea5d1..279e4a7 100644
--- a/draft-roadmap/extend_chat_sdk_with_group_conversations.md
+++ b/draft-roadmap/extend_chat_sdk_with_group_conversations.md
@@ -32,7 +32,7 @@ Logos Movement Module Build Out
 
 ## Deliverables
 
-### Add Group Chat
+### [Add Group Chat](https://github.com/waku-org/pm/issues/346)
 
 **Owner**: App/Chat Research
 
@@ -61,7 +61,7 @@ Logos Movement Module Build Out
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Group Chat Bindings
+### [Group Chat Bindings](https://github.com/waku-org/pm/issues/348)
 
 **Owner**: App/Chat Dev
 
@@ -78,7 +78,7 @@ Logos Movement Module Build Out
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Enable usage with RLN SDK
+### [Enable usage with RLN SDK](https://github.com/waku-org/pm/issues/347)
 
 **Owner**: App/Chat Dev
 
diff --git a/draft-roadmap/formalize_and_expand_waku_web_apps.md b/draft-roadmap/formalize_and_expand_waku_web_apps.md
index cd88664..80e9f27 100644
--- a/draft-roadmap/formalize_and_expand_waku_web_apps.md
+++ b/draft-roadmap/formalize_and_expand_waku_web_apps.md
@@ -33,7 +33,7 @@ Logos Movement Community Enabling
 
 ## Deliverables
 
-### [Forum PoC](https://github.com/waku-org/pm/issues/292) 
+### [Forum PoC](https://github.com/waku-org/pm/issues/292)
 
 **Owner**: App/Chat Dev
 
@@ -94,7 +94,7 @@ Logos Movement Community Enabling
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Build Ten Waku Web Apps
+### [Build Ten Waku Web Apps](https://github.com/waku-org/pm/issues/349)
 
 **Owner**: App/Chat Dev
 
@@ -115,7 +115,7 @@ Logos Movement Community Enabling
   - [ ] Walkthrough Video
   - [ ] Social media post for re-broadcast
 
-### Build One Waku Logos Core App
+### [Build One Waku Logos Core App](https://github.com/waku-org/pm/issues/350)
 
 **Owner**: App/Chat Dev
 
@@ -136,7 +136,7 @@ Logos Movement Community Enabling
   - [ ] Walkthrough Video
   - [ ] Social media post for re-broadcast
 
-### Open Forum to Web3 Users and Anons
+### [Open Forum to Web3 Users and Anons](https://github.com/waku-org/pm/issues/351)
 
 **Owner**: App/Chat Dev
 
@@ -160,4 +160,4 @@ Logos Movement Community Enabling
 - [ ] Specs: link to specs and/or API definition
 - [ ] Code: link to GitHub issues/PRs/Epic
 - [ ] Dogfood: link to dogfooding session/artefact
-- [ ] Docs: links to README.md or docs.waku.org (TBD)
\ No newline at end of file
+- [ ] Docs: links to README.md or docs.waku.org (TBD)
diff --git a/draft-roadmap/harden_rln_testnet.md b/draft-roadmap/harden_rln_testnet.md
index 73e6bb2..00510f4 100644
--- a/draft-roadmap/harden_rln_testnet.md
+++ b/draft-roadmap/harden_rln_testnet.md
@@ -34,7 +34,7 @@ Logos Vision: Core Values Alignment
 
 ## Deliverables 
 
-### Zerokit is used in the Browser for Credentials Management
+### [Zerokit is used in the Browser for Credentials Management](https://github.com/waku-org/pm/issues/341)
 
 **Owner**: js-waku
 
diff --git a/draft-roadmap/improve_devex_api_twn_metrics_docs.md b/draft-roadmap/improve_devex_api_twn_metrics_docs.md
index 1110eb2..7bf5035 100644
--- a/draft-roadmap/improve_devex_api_twn_metrics_docs.md
+++ b/draft-roadmap/improve_devex_api_twn_metrics_docs.md
@@ -89,7 +89,7 @@ Spec delivery not included.
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Introduce Waku API in the Browser
+### [Introduce Waku API in the Browser](https://github.com/waku-org/pm/issues/283)
 
 **Owner**: js-waku
 
@@ -118,7 +118,7 @@ For S3. Browser; distribution via npmjs.com.
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Introduce Waku API in nwaku
+### [Introduce Waku API in nwaku](https://github.com/waku-org/pm/issues/305)
 
 **Owner**: nwaku
 
@@ -149,7 +149,7 @@ For:
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Review Documentation and Define Guidelines
+### [Review Documentation and Define Guidelines](https://github.com/waku-org/pm/issues/323)
 
 **Owner**: core research
 
@@ -162,7 +162,7 @@ For:
   - [ ] How to contribute to documentation: location, format
 - [ ] Setup an initial structure to enable the guideline
 
-### Trial QUIC
+### [Trial QUIC](https://github.com/waku-org/pm/issues/324)
 
 **Owner**: nwaku
 
@@ -177,7 +177,7 @@ For:
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Optimise Browser Bootstrapping
+### [Optimise Browser Bootstrapping](https://github.com/waku-org/pm/issues/290)
 
 **Owner**: js-waku
 
diff --git a/draft-roadmap/integrate_rln_with_waku_api.md b/draft-roadmap/integrate_rln_with_waku_api.md
index d8cacd2..0e3184e 100644
--- a/draft-roadmap/integrate_rln_with_waku_api.md
+++ b/draft-roadmap/integrate_rln_with_waku_api.md
@@ -40,7 +40,7 @@ See deliverables.
 
 ## Deliverables 
 
-### Implement RLN membership management in nwaku library
+### [Implement RLN membership management in nwaku library](https://github.com/waku-org/pm/issues/353)
 
 **Owner**: nwaku
 
@@ -69,7 +69,7 @@ See deliverables.
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Implement RLN Onchain Tree Proof generation and verification in the Browser 
+### [Implement RLN Onchain Tree Proof generation and verification in the Browser](https://github.com/waku-org/pm/issues/354) 
 
 **Owner**: js-waku
 
@@ -87,7 +87,7 @@ See deliverables.
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Extract RLN as a plug-in library from nwaku 
+### [Extract RLN as a plug-in library from nwaku](https://github.com/waku-org/pm/issues/355) 
 
 **Owner**: nwaku
 
@@ -116,7 +116,7 @@ See deliverables.
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Deploy RLN Contracts to Status L2 testnet
+### [Deploy RLN Contracts to Status L2 testnet](https://github.com/waku-org/pm/issues/356)
 
 **Owner**: nwaku
 
diff --git a/draft-roadmap/introduce_mixnet_for_message_sending.md b/draft-roadmap/introduce_mixnet_for_message_sending.md
index 38125c0..c34fef6 100644
--- a/draft-roadmap/introduce_mixnet_for_message_sending.md
+++ b/draft-roadmap/introduce_mixnet_for_message_sending.md
@@ -24,7 +24,7 @@ See deliverables.
 
 ## Deliverables
 
-### [Integrate libp2p mix into lightpush](https://github.com/waku-org/nwaku/issues/3280)
+### [Integrate libp2p mix into lightpush](https://github.com/waku-org/pm/issues/291)
 
 **Owner**: core research
 
diff --git a/draft-roadmap/streamline_dev_ex_local_dev_rust.md b/draft-roadmap/streamline_dev_ex_local_dev_rust.md
index f2eb66b..6a825c2 100644
--- a/draft-roadmap/streamline_dev_ex_local_dev_rust.md
+++ b/draft-roadmap/streamline_dev_ex_local_dev_rust.md
@@ -35,7 +35,7 @@ See deliverables.
 
 ## Deliverables
 
-### Edge Mode in Nwaku
+### [Edge Mode in Nwaku](https://github.com/waku-org/pm/issues/357)
 
 **Owner**: nwaku
 
@@ -56,7 +56,7 @@ See deliverables.
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Nwaku in Status Mobile
+### [Nwaku in Status Mobile](https://github.com/waku-org/pm/issues/358)
 
 **Owner**: nwaku
 
@@ -74,7 +74,7 @@ See deliverables.
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Waku Rust SDK
+### [Waku Rust SDK](https://github.com/waku-org/pm/issues/289)
 
 **Owner**: nwaku
 
@@ -89,7 +89,7 @@ See deliverables.
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Local Web Dev Harness
+### [Local Web Dev Harness](https://github.com/waku-org/pm/issues/359)
 
 **Owner**: js-waku
 
@@ -114,7 +114,7 @@ See deliverables.
 - [ ] Dogfood: link to dogfooding session/artefact
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
-### Local Dev RLN Harness
+### [Local Dev RLN Harness](https://github.com/waku-org/pm/issues/360)
 
 **Owner**: nwaku
 
diff --git a/draft-roadmap/nim_usage_improvements.md b/draft-roadmap/upgrade_nim_usage.md
similarity index 97%
rename from draft-roadmap/nim_usage_improvements.md
rename to draft-roadmap/upgrade_nim_usage.md
index 7c1dbe4..aa9ff44 100644
--- a/draft-roadmap/nim_usage_improvements.md
+++ b/draft-roadmap/upgrade_nim_usage.md
@@ -76,7 +76,7 @@ Note: maybe taken over by Vac-Nim
 - [ ] Docs: links to README.md or docs.waku.org (TBD)
 
 
-### Create nim-ffi, a library to easily exposes c-bindings from Nim
+### [Create nim-ffi, a library to easily exposes c-bindings from Nim](https://github.com/waku-org/pm/issues/332)
 
 **Owner**: nwaku