diff --git a/.github/ISSUE_TEMPLATE/deliverable.md b/.github/ISSUE_TEMPLATE/deliverable.md
new file mode 100644
index 0000000..a1ffc04
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/deliverable.md
@@ -0,0 +1,40 @@
+---
+name: Deliverable Issue Template
+about: Deliverable issue
+title: "[Deliverable] "
+labels: Deliverable
+assignees: ''
+
+---
+<!-- Use GitHub Project fields "due date" and "planned start" to set dates -->
+<!-- Assignees should be the team leads for the teams involved in the Deliverable -->
+
+
+## Summary
+
+<!-- Provide a high level summary of the Deliverable -->
+<!-- Link to Deliverable description from roadmap.logos.co -->
+
+## Acceptance Criteria
+
+<!-- describe the deliverable and its attributes in plain English -->
+
+## Tasks
+
+<!-- Please add task issues under the appropriate team -->
+
+<!-- ## Research
+- [ ] ...
+- [ ] 
+
+## nwaku
+- [ ] ...
+- [ ] 
+
+## js-waku
+- [ ] ...
+- [ ] 
+
+## Chat
+- [ ] ...
+- [ ]  -->
diff --git a/.github/ISSUE_TEMPLATE/epic.md b/.github/ISSUE_TEMPLATE/epic.md
deleted file mode 100644
index 176c5ec..0000000
--- a/.github/ISSUE_TEMPLATE/epic.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: Epic Issue Template
-about: Track Epics
-title: "[Research/nwaku/go-waku/js-waku/Docs/QA/Eco-Dev] "
-labels: epic
-assignees: ''
-
----
-
-
-<!-- Use GitHub Project fields "due date" and "planned start" to set dates -->
-**Epic label**: `E:...`
-
-# Summary
-
-<!-- Provide a high level summary of the Epic -->  
-
-# Acceptance Criteria
-
-<!-- describe the deliverable of this epic and its attributes in plain English -->
-
-# Tasks
-
-<!-- can be generated using the `epics` command of https://github.com/fryorcraken/milestone-update/ -->
-<!--
-
-Breakdown of the work
-
-- [ ] research: ...
-- [ ] nwaku: ...
-
--->
-
diff --git a/.github/ISSUE_TEMPLATE/milestone.md b/.github/ISSUE_TEMPLATE/milestone.md
deleted file mode 100644
index 9f4e685..0000000
--- a/.github/ISSUE_TEMPLATE/milestone.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-name: Milestone Issue Template
-about: Track Key Milestones
-title: "[Milestone] "
-labels: milestone
-assignees: ''
-
----
-
-**Milestone**: <!-- URL to the GitHub Milestone -->
-
-# Summary
-
-<!-- Provide a high level summary of the Milestone -->  
-
-# Justification
-
-<!-- Justify the Milestone in the context of the priority tracks and project/collective strategies -->
-
-# Epics
-
-- research: <URL to Research Epic>
-- js-waku: 
-- nwaku: 
-- go-waku:
-- QA: 
-- Docs:
-- Eco-Dev:
-
-# RAID (Risks, Assumptions, Issues and Dependencies)
-
-<!-- List dependencies on other milestones (avoid dependencies on tasks) -->
-
-<!-- List dependencies on other teams -->
-
-<!-- List any risks or assumptions that will be cleared as work progresses -->
-
-<!-- List any GitHub issues that tracks any blocker or any of the items above -->