diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 84%
rename from .github/ISSUE_TEMPLATE
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 3fca3c6..01e9853 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,3 +1,12 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
 <!--- Issues must not contain any PHI, PII, or other confidential information. --->
 
 <!--- Provide a general summary of the issue in the Title above -->
@@ -5,15 +14,12 @@
 ## Problem Summary
 <!--- Give a concise description of the problem -->
 
-
 ## Impact
 <!--- Explain why this is a problem and to whom -->
 
-
 ## Possible Solution
 <!--- Not obligatory, but suggest a fix/reason for the bug, -->
 
-
 ## Steps to Reproduce
 <!--- Provide code to reproduce the issue that uses -->
 <!--- a dataset from load_example_dataset() -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..0fc9767
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'enhancement'
+assignees: ''
+
+---
+
+<!--- Feature requests must not contain any PHI, PII, or other confidential information. --->
+
+## Is your feature request related to a problem? Please describe
+<!--- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] --->
+
+## Describe the solution you'd like
+<!--- A clear and concise description of what you want to happen. --->
+
+## Describe alternatives you've considered
+<!--- A clear and concise description of any alternative solutions or features you've considered. --->
+
+## Additional context
+<!--- Add any other context or screenshots about the feature request here. Also add if you are interested in implementing parts of this request. --->