diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 57%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 1d4b00868..58cf94143 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,8 +1,17 @@
-For reporting security vulnerabilities [please refer to the website.](https://www.nomadproject.io/security.html)
+---
+name: Bug Report
+about: Let us know about an unexpected error, a crash, or an incorrect behavior.
+labels: "type/bug"
+---
 
-If you have a question, prepend your issue with `[question]` or preferably use the [nomad mailing list](https://www.nomadproject.io/community.html).
+<!--
+Hi there,
 
-If filing a bug please include the following:
+Thank you for opening an issue. Please note that we try to keep the Nomad issue
+tracker reserved for bug reports and feature requests. For general usage
+questions, please see: https://www.nomadproject.io/community
+
+-->
 
 ### Nomad version
 Output from `nomad version`
@@ -13,11 +22,15 @@ Output from `nomad version`
 
 ### Reproduction steps
 
+#### Expected Result
+
+#### Actual Result
+
 ### Job file (if appropriate)
 
-### Nomad Client logs (if appropriate)
+<!--
 If possible please post relevant logs in the issue.
-
+`
 Logs and other artifacts may also be sent to: nomad-oss-debug@hashicorp.com
 
 Please link to your Github issue in the email and reference it in the subject
@@ -27,6 +40,10 @@ line:
 >
 > Subject: GH-1234: Errors garbage collecting allocs
 
-Emails sent to that address are readable by all HashiCorp employees but are *not* publicly visible.
+Emails sent to that address are readable by all HashiCorp employees but are
+*not* publicly visible.
+-->
 
 ### Nomad Server logs (if appropriate)
+
+### Nomad Client logs (if appropriate)
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..f0971b9fd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Ask a Question
+    url: https://discuss.hashicorp.com/c/nomad
+    about: If you have a question, or are looking for advice, please post on our Discuss forum.
+  - name: Nomad Learn Tracks
+    url: https://learn.hashicorp.com/nomad
+    about: Please check out our Learn Guides. These hands on guides deal with many of the tassk common to using Nomad.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..dc5abe1dd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,36 @@
+---
+name: Feature Request
+about: Suggest a new feature or enhancement to Nomad
+labels: "type/enhancement"
+---
+
+<!--
+Hi there,
+
+Thank you for opening an issue. Please note that we try to keep the Nomad issue
+tracker reserved for bug reports and feature requests. For general usage
+questions, please see: https://www.nomadproject.io/community
+
+-->
+
+### Proposal
+<!--
+If you have an idea for a way to address the problem via a change to Nomad’s
+features, please describe it below.
+-->
+
+### Use-cases
+<!--
+In order to properly evaluate the 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.
+-->
+
+### Attempted Solutions
+<!--
+If you have already tried to solve the problem within Nomad’s existing features
+and found a limitation that prevented you from succeeding, please describe it
+below.
+-->
+
+