diff --git a/.github/ISSUE_TEMPLATES/feature_request.md b/.github/ISSUE_TEMPLATES/feature_request.md
new file mode 100644
index 00000000..c1c87ccb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATES/feature_request.md
@@ -0,0 +1,29 @@
+---
+name: Feature request
+about: Suggest a new feature or other enhancement.
+title: ''
+labels: 'feature'
+assignees: ''
+
+---
+
+### Use-cases
+<!---
+In order to properly evaluate a feature request, it is necessary to understand the use-cases for it.
+
+Please describe below the _end goal_ you are trying to achieve that has led you to request this feature.
+
+Please keep this section focused on the problem and not on the suggested solution. We'll get to that in a moment, below!
+-->
+
+### Proposal
+<!---
+If you have an idea for a way to address the problem via a change, please describe it below.
+
+If you're not sure of some details, don't worry! When we evaluate the feature request we may suggest modifications.
+-->
+
+### References
+<!--
+Anything else, such as links to other issues or examples, that didn't seem to fit above.
+-->
diff --git a/.github/issue_template.md b/.github/ISSUE_TEMPLATES/problem_report.md
similarity index 84%
rename from .github/issue_template.md
rename to .github/ISSUE_TEMPLATES/problem_report.md
index 9cceeebc..2a1fa81b 100644
--- a/.github/issue_template.md
+++ b/.github/ISSUE_TEMPLATES/problem_report.md
@@ -1,5 +1,11 @@
-# Report
+---
+name: Problem
+about: Tell us about a problem you've encountered.
+title: ''
+labels: 'problem'
+assignees: ''
 
+---
 ## What did you do?
 
 ℹ Please replace this with what you did.
@@ -23,4 +29,4 @@ e.g. 💥
 * If relevant, which [execution harness](2) are you attempting to use?
 
 [1]: https://github.com/redcanaryco/atomic-red-team/tree/master/atomics "atomic tests"
-[2]: https://github.com/redcanaryco/atomic-red-team/tree/master/execution-frameworks "execution frameworks"
\ No newline at end of file
+[2]: https://github.com/redcanaryco/atomic-red-team/tree/master/execution-frameworks "execution frameworks"
diff --git a/.github/ISSUE_TEMPLATES/website_change.md b/.github/ISSUE_TEMPLATES/website_change.md
new file mode 100644
index 00000000..1ef40043
--- /dev/null
+++ b/.github/ISSUE_TEMPLATES/website_change.md
@@ -0,0 +1,19 @@
+---
+name: Website change
+about: Propose a change to the website at https://atomicredteam.io
+title: ''
+labels: 'website'
+assignees: ''
+
+---
+
+### Why the change? 
+
+
+### A summary of the change
+
+
+### References
+<!--
+Anything else, such as links to other issues or examples, that didn't seem to fit above.
+-->