diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index a9ec3df..0f8d51f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,11 +1,12 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ""
-labels: ""
+title: "[Bug]"
+labels: bug
 assignees: ""
 ---
 
+- [Overview](#overview)
 - [Describe the bug](#describe-the-bug)
 - [To Reproduce](#to-reproduce)
 - [Expected behavior](#expected-behavior)
@@ -16,36 +17,57 @@ assignees: ""
 
 <small><i><a href='http://ecotrust-canada.github.io/markdown-toc/'>Table of contents generated with markdown-toc</a></i></small>
 
+# Overview
+
+- **Requester**: @ the requestor.
+- **Epic Link**: Link the epic.
+
 # Describe the bug
 
+<!---
 A clear and concise description of what the bug is.
+--->
 
 # To Reproduce
 
 Steps to reproduce the behavior:
 
+<!---
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
+--->
 
 # Expected behavior
 
+<!---
 A clear and concise description of what you expected to happen.
+--->
 
 # Evidence
 
+<!---
+Provide any supporting documentation.
+--->
+
 ## Logs
 
+<!---
 Provide any logs if applicable.
+--->
 
 ## Screenshots
 
+<!---
 If applicable, add screenshots to help explain your problem.
+--->
 
 # Additional context
 
+<!---
 Add any other context about the problem here.
+--->
 
 **Desktop (please complete the following information):**
 
diff --git a/.github/ISSUE_TEMPLATE/epic.md b/.github/ISSUE_TEMPLATE/epic.md
new file mode 100644
index 0000000..bccbbd9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/epic.md
@@ -0,0 +1,62 @@
+---
+name: Epic
+about: Template for creating an Epic
+title: "[EPIC]"
+labels: epic
+assignees: ""
+---
+
+- [Overview](#overview)
+  - [Description](#description)
+- [Dependencies](#dependencies)
+- [Context](#context)
+- [Issues](#issues)
+- [Acceptance criteria](#acceptance-criteria)
+  - [Proof](#proof)
+
+<small><i><a href='http://ecotrust-canada.github.io/markdown-toc/'>Table of contents generated with markdown-toc</a></i></small>
+
+# Overview
+
+- **Owner**: @ the owner.
+- **Stakeholder Point of Contact**: @ the point of contact.
+
+## Description
+
+<!---
+Describe what this epic is supposed to solve.
+--->
+
+# Dependencies
+
+<!---
+What are the dependencies for this epic.
+--->
+
+# Context
+
+<!---
+Provide any useful context.
+--->
+
+# Issues
+
+<!---
+Link any issues
+--->
+
+- [ ] Issue one
+- [ ] issue two
+- [ ] issue three
+
+# Acceptance criteria
+
+<!---
+What needs to occur for this to be successful.
+--->
+
+## Proof
+
+<!---
+Link any PR's, documents, other evidence highlighting that the acceptance criteria were met.
+--->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bdb347e..f9e857f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,30 +1,41 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ""
-labels: ""
+title: "[Feature]"
+labels: feature
 assignees: ""
 ---
 
-- [Request](#request)
-  - [Potential Solution](#potential-solution)
+- [Overview](#overview)
+  - [Request](#request)
+- [Potential Solution](#potential-solution)
   - [Alternative Solutions](#alternative-solutions)
 - [Additional Context](#additional-context)
 
 <small><i><a href='http://ecotrust-canada.github.io/markdown-toc/'>Table of contents generated with markdown-toc</a></i></small>
 
-# Request
+# Overview
 
-**Explain what you want and why. If this feature is related to a problem please highlight it here.**
+- **Requester**: @ the requestor.
+- **Epic Link**: Link the epic.
 
-## Potential Solution
+## Request
 
-**Provide any details for a potential solution.**
+<!---
+Explain what you want and why. If this feature is related to a problem please highlight it here.**
+--->
+
+# Potential Solution
+
+<!---Provide any details for a potential solution.
+--->
 
 ## Alternative Solutions
 
-**Provide any alternative solutions.**
+<!---Provide any alternative solutions.
+--->
 
 # Additional Context
 
-**Provide Additional Context.**
+<!---Provide Additional Context.
+--->