diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b9ce5bf40c3d..c85e33093950 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,8 +1,8 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Provide a report of unexpected behaviour
 title: ""
-labels: "Bug"
+labels: "Type: Bug"
 assignees: ""
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 2a38662fc86a..e4d717cf644d 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,11 @@
 blank_issues_enabled: true
 contact_links:
-    - name: Filecoin Slack Channel
+    - name: Filecoin Slack (#fil-forest-help or #fil-forest-dev)
       url: https://join.slack.com/t/filecoinproject/shared_invite/enQtNTUwNTI1Mzk5MDYwLTY4YmFjMzRlZjFiNDc0NmI2N2JjMjk5YTAyMDUyODljODg3MGI0ZGRhZTI5ZDNkZTAyNjkyMzI1ODM1YjA1MWI
       about: Please ask questions here.
-    - name: Filecoin Discussion Forum
-      url: https://discuss.filecoin.io/
-      about: Please ask and answer questions here.
-    - name: ChainSafe Forest Implementation Forum
-      url: https://discord.gg/Q6A3YA2
-      about: Please ask forest specific questions here.      
\ No newline at end of file
+    - name: General Filecoin Discussion Forum
+      url: https://github.com/filecoin-project/community/discussions
+      about: Please ask any general Filecoin questions here.
+    - name: Forest Discussion Forum
+      url: https://github.com/ChainSafe/forest/discussions
+      about: Please ask Forest specific questions here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/epic.md b/.github/ISSUE_TEMPLATE/epic.md
new file mode 100644
index 000000000000..f0dbe0ed22e2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/epic.md
@@ -0,0 +1,30 @@
+---
+name: Epic
+about: [Internal] Larger chunk of work that can be broken down into a smaller tasks
+title: ""
+labels: "Type: Epic"
+assignees: ""
+---
+
+# Summary
+
+<!-- Provide a summary of the epic -->
+
+# Motivation
+
+<!-- Describe the rationale for this epic. What does it enable? Who does it serve? -->
+
+# Tasks
+
+<!-- Provide a list of individual tasks that would complete this epic -->
+<!-- This should be a list of issues once they are created -->
+
+- [ ]
+
+# Risks & Dependencies
+
+<!-- Identify any potential risks or external dependencies in completing this epic -->
+
+# Additional Links & Resources
+
+<!-- Any additional context or resources that may be relevant -->
diff --git a/.github/ISSUE_TEMPLATE/general_report.md b/.github/ISSUE_TEMPLATE/general_report.md
deleted file mode 100644
index 8e6763f43ac0..000000000000
--- a/.github/ISSUE_TEMPLATE/general_report.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: General issue
-about: General purpose issue template
-title: ""
-assignees: ""
----
-
-## Issue summary
-
-<!-- A clear and concise description of what the task is. -->
-
-## Other information and links
-
-<!-- Add any other context or screenshots about the issue here. -->
-
-<!-- Thank you 🙏 -->
diff --git a/.github/ISSUE_TEMPLATE/new_issue.md b/.github/ISSUE_TEMPLATE/new_issue.md
deleted file mode 100644
index 6f09336d3ec1..000000000000
--- a/.github/ISSUE_TEMPLATE/new_issue.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: New issue
-about: New issue template
-title: ""
-assignees: ""
----
-
-## Issue summary
-
-<!-- A clear and concise description of what the issue is. -->
-
-## Task summary
-
-<!-- A clear and concise description of what the task(s) are. -->
-
-- [ ] Task 1
-- [ ] Task 2
-- [x] Task 3
-- [x] Task 4
-- [x] Task 5
-
-## Acceptance Criteria
-
-<!-- Provide the acceptance criteria for the issue. -->
-
-- [ ] acceptance criteria #1
-- [ ] acceptance criteria #2
-- [x] acceptance criteria #3
-
-## Other information and links
-
-<!-- Add any other context, existing implementation reference or screenshots about the task here. -->
-
-<!-- Thank you 💪 -->
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
new file mode 100644
index 000000000000..1498a0a9a03d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -0,0 +1,22 @@
+---
+name: Other
+about: Use wisely 🧐
+title: ""
+labels: ""
+assignees: ""
+---
+
+<!-- Please complete this checklist before proceeding -->
+
+This issue is NOT:
+
+- [ ] A bug
+- [ ] A user-request
+- [ ] An epic
+- [ ] A task
+
+Please check the other issue types if any of these categories apply.
+
+---
+
+<!-- Type below this line -->
diff --git a/.github/ISSUE_TEMPLATE/task.md b/.github/ISSUE_TEMPLATE/task.md
new file mode 100644
index 000000000000..20ece671a8ff
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/task.md
@@ -0,0 +1,21 @@
+---
+name: Task
+about: [internal] A specific, actionable unit of work
+title: ""
+labels: "Type: Task"
+assignees: ""
+---
+
+# Summary
+
+<!-- Describe the task -->
+
+# Completion Criteria
+
+<!-- List the necessary criteria to complete this issue -->
+
+- [ ]
+
+# Additional Links & Resources
+
+<!-- Anything that might need to be referenced during implementation -->
diff --git a/.github/ISSUE_TEMPLATE/task_req.md b/.github/ISSUE_TEMPLATE/task_req.md
deleted file mode 100644
index 0d2aa14a97cb..000000000000
--- a/.github/ISSUE_TEMPLATE/task_req.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Task requirement
-about: Required tasks to complete
-title: ""
-assignees: ""
----
-
-## Task summary
-
-<!-- A clear and concise description of what the task is. -->
-
-## Specification reference
-
-<!-- Provide a reference to the specification as to what is being implemented. -->
-
-## Other information and links
-
-<!-- Add any other context, existing implementation reference or screenshots about the task here. -->
-
-<!-- Thank you 💪 -->
diff --git a/.github/ISSUE_TEMPLATE/user_request.md b/.github/ISSUE_TEMPLATE/user_request.md
new file mode 100644
index 000000000000..adcb7b25117e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/user_request.md
@@ -0,0 +1,19 @@
+---
+name: User Request
+about: Request a feature or change
+title: ""
+labels: "Type: Request"
+assignees: ""
+---
+
+# Summary
+
+<!-- Provide a high-level summary of the issue -->
+
+# Requirements
+
+<!-- Provide a list of requirements that you believe would satisfy the completion of this request -->
+
+# Motivation
+
+<!-- Give us some insight why this is important for you -->