diff --git a/.github/ISSUE_TEMPLATE/epic.md b/.github/ISSUE_TEMPLATE/epic.md
index 5f99cd1..52435cc 100644
--- a/.github/ISSUE_TEMPLATE/epic.md
+++ b/.github/ISSUE_TEMPLATE/epic.md
@@ -28,17 +28,8 @@ assignees: ''
 
 Breakdown of the work
 
-- [ ] Task 1
-- [ ] Link to GitHub issue tracking task 2
+- [ ] research: ...
+- [ ] nwaku: ...
 
 -->
 
-# 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 -->
diff --git a/.github/ISSUE_TEMPLATE/milestone.md b/.github/ISSUE_TEMPLATE/milestone.md
index caee3c9..2a3dd55 100644
--- a/.github/ISSUE_TEMPLATE/milestone.md
+++ b/.github/ISSUE_TEMPLATE/milestone.md
@@ -12,7 +12,6 @@ assignees: ''
 **Milestone**: <!-- URL to the GitHub Milestone -->
 <!-- Remove tracks as needed -->
 **Priority Tracks**: Secure Scalability, Production Readiness, Growth, Generating Revenue (Sustainability & Longevity).
-**Due date**:
 
 # Summary
 
@@ -22,8 +21,12 @@ assignees: ''
 
 <!-- Justify the Milestone in the context of the priority tracks and project/collective strategies -->
 
-# Epics
+# RAID (Risks, Assumptions, Issues and Dependencies)
 
-- [ ] research: Milestone title or link 
-- ...
+<!-- 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 -->