diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 0c2b411697..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,9 +0,0 @@
-As X, I want Y so that Z.
-
-## Acceptance Criteria
-
-- [ ] Verify
-
-## Assumptions and Questions
-
--
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100644
index 0000000000..5be3964c6f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**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.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Context (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser: [e.g. chrome, safari]
+ - Commit Hash from status endpoint:
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 0000000000..6940bd20f5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,35 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+## User Story
+As X, I want Y so that Z.
+
+## Impacts
+Ex. API, UI, Docs
+
+## Role
+
+
+## Assumptions
+-
+-
+
+## API Details
+
+| API  | Detail|
+ | --- | --- |
+ | **Method** | GET/POST/PUT/PATCH/DELETE |
+ | **Path** | /api/v1/?/ |
+ | **Body** |  |
+ | **Response** | |
+
+## UI Details
+
+
+## Acceptance Criteria
+
+- [ ]
+- [ ]