diff --git a/.github/ISSUE_TEMPLATE/CHANGE.md b/.github/ISSUE_TEMPLATE/CHANGE.md
new file mode 100644
index 000000000000..b8181f56cfec
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/CHANGE.md
@@ -0,0 +1,25 @@
+<!--
+    ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
+
+    This template is for requesting a change that is not a bug fix, rule change, or new rule. If you are here for another reason, please see below:
+
+    1. To report a bug: https://eslint.org/docs/developer-guide/contributing/reporting-bugs
+    2. To request a rule change: https://eslint.org/docs/developer-guide/contributing/rule-changes
+    3. To propose a new rule: https://eslint.org/docs/developer-guide/contributing/new-rules
+    4. If you have any questions, please stop by our chatroom: https://gitter.im/eslint/eslint
+
+    Note that leaving sections blank will make it difficult for us to troubleshoot and we may have to close the issue.
+-->
+
+**Tell us about your environment**
+
+* **ESLint Version:**
+* **Node Version:**
+* **npm Version:**
+
+**What did you do?**
+
+**What happened?**
+
+**What did you expect to happen?**
+
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md
similarity index 72%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md
index d33ca110584c..3cf719784e0e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md
@@ -1,11 +1,12 @@
 <!--
     ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
 
-    This template is for bug reports. If you are reporting a bug, please continue on. If you are here for another reason, please see below:
+    This template is for bug reports. If you are here for another reason, please see below:
 
     1. To propose a new rule: https://eslint.org/docs/developer-guide/contributing/new-rules
-    2. To request a change: https://eslint.org/docs/developer-guide/contributing/changes
-    3. If you have any questions, please stop by our chatroom: https://gitter.im/eslint/eslint
+    2. To request a rule change: https://eslint.org/docs/developer-guide/contributing/rule-changes
+    3. To request a change that is not a bug fix, rule change, or new rule: https://eslint.org/docs/developer-guide/contributing/changes
+    4. If you have any questions, please stop by our chatroom: https://gitter.im/eslint/eslint
 
     Note that leaving sections blank will make it difficult for us to troubleshoot and we may have to close the issue.
 -->
@@ -26,8 +27,6 @@
 <!-- Paste your configuration below: -->
 ```js
 
-
-
 ```
 
 </details>
@@ -37,10 +36,6 @@
 <!-- Paste the source code below: -->
 ```js
 
-
-
-
-
 ```
 
 <!-- Paste the command you used to run ESLint: -->
diff --git a/.github/ISSUE_TEMPLATE/NEW_RULE.md b/.github/ISSUE_TEMPLATE/NEW_RULE.md
new file mode 100644
index 000000000000..81248324be64
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/NEW_RULE.md
@@ -0,0 +1,31 @@
+<!--
+    ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
+
+    This template is for new rule proposals. If you are proposing a new rule, please continue on. If you are here for another reason, please see below:
+
+    1. To report a bug: https://eslint.org/docs/developer-guide/contributing/reporting-bugs
+    2. To request a rule change: https://eslint.org/docs/developer-guide/contributing/rule-changes
+    3. To request a change that is not a bug fix, rule change, or new rule: https://eslint.org/docs/developer-guide/contributing/changes
+    4. If you have any questions, please stop by our chatroom: https://gitter.im/eslint/eslint
+
+    Note that leaving sections blank will make it difficult for us to troubleshoot and we may have to close the issue.
+-->
+
+**Please describe what the rule should do:**
+
+**What category of rule is this? (place an "X" next to just one item)**
+
+[ ] Enforces code style
+[ ] Warns about a potential error
+[ ] Suggests an alternate way of doing something
+[ ] Other (please specify:)
+
+**Provide 2-3 code examples that this rule will warn about:**
+
+<!-- Put your code examples here -->
+```js
+
+```
+
+**Why should this rule be included in ESLint (instead of a plugin)?**
+
diff --git a/.github/ISSUE_TEMPLATE/RULE_CHANGE.md b/.github/ISSUE_TEMPLATE/RULE_CHANGE.md
new file mode 100644
index 000000000000..b68b90714760
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/RULE_CHANGE.md
@@ -0,0 +1,30 @@
+<!--
+    ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
+
+    This template is for requesting a rule change. If you are here for another reason, please see below:
+
+    1. To report a bug: https://eslint.org/docs/developer-guide/contributing/reporting-bugs
+    2. To propose a new rule: https://eslint.org/docs/developer-guide/contributing/new-rules
+    3. To request a change that is not a bug fix, rule change, or new rule: https://eslint.org/docs/developer-guide/contributing/changes
+    4. If you have any questions, please stop by our chatroom: https://gitter.im/eslint/eslint
+
+    Note that leaving sections blank will make it difficult for us to troubleshoot and we may have to close the issue.
+-->
+
+**What rule do you want to change?**
+
+**Does this change cause the rule to produce more or fewer warnings?**
+
+**How will the change be implemented? (New option, new default behavior, etc.)?**
+
+**Please provide some example code that this change will affect:**
+
+<!-- Put your code examples here -->
+```js
+
+```
+
+**What does the rule currently do for this code?**
+
+**What will the rule do after it's changed?**
+
diff --git a/docs/developer-guide/contributing/changes.md b/docs/developer-guide/contributing/changes.md
index 957f1286edc0..6b5f1590107f 100644
--- a/docs/developer-guide/contributing/changes.md
+++ b/docs/developer-guide/contributing/changes.md
@@ -1,6 +1,6 @@
 # Change Requests
 
-If you'd like to request a change to ESLint, please [create a new issue](https://github.com/eslint/eslint/issues/new?body=**What%20version%20are%20you%20using%3F**%0A%0A**What%20did%20you%20do%3F**%0A%0A**What%20happened%3F**%0A%0A**What%20did%20you%20expect%20to%20happen%3F**%0A%0A) on GitHub. Be sure to include the following information:
+If you'd like to request a change to ESLint, please [create a new issue](https://github.com/eslint/eslint/issues/new?template=CHANGE.md) on GitHub. Be sure to include the following information:
 
 1. The version of ESLint you are using.
 1. The problem you want to solve.
diff --git a/docs/developer-guide/contributing/new-rules.md b/docs/developer-guide/contributing/new-rules.md
index 072ca67004ec..81a7529d814b 100644
--- a/docs/developer-guide/contributing/new-rules.md
+++ b/docs/developer-guide/contributing/new-rules.md
@@ -19,7 +19,7 @@ Even though these are the formal criteria for inclusion, each rule is evaluated
 
 ## Proposing a Rule
 
-If you want to propose a new rule, [create a pull request](/docs/developer-guide/contributing/pull-requests.md) or new issue and paste the questions from the [rule proposal template](https://github.com/eslint/eslint/blob/master/templates/rule-proposal.md) into the description.
+If you want to propose a new rule, [create a pull request](/docs/developer-guide/contributing/pull-requests.md) or new issue and paste the questions from the [rule proposal template](https://github.com/eslint/eslint/issues/new?template=NEW_RULE.md) into the description.
 
 We need all of this information in order to determine whether or not the rule is a good core rule candidate.
 
diff --git a/docs/developer-guide/contributing/reporting-bugs.md b/docs/developer-guide/contributing/reporting-bugs.md
index bfd8660b22a6..81f5e8562e7e 100644
--- a/docs/developer-guide/contributing/reporting-bugs.md
+++ b/docs/developer-guide/contributing/reporting-bugs.md
@@ -1,6 +1,6 @@
 # Reporting Bugs
 
-If you think you've found a bug in ESLint, please [create a new issue](https://github.com/eslint/eslint/issues/new) or a [pull request](/docs/developer-guide/contributing/pull-requests.md) on GitHub. Be sure to copy the questions from the [bug report template](https://github.com/eslint/eslint/blob/master/templates/bug-report.md).
+If you think you've found a bug in ESLint, please [create a new issue](https://github.com/eslint/eslint/issues/new) or a [pull request](/docs/developer-guide/contributing/pull-requests.md) on GitHub.
 
 Please include as much detail as possible to help us properly address your issue. If we need to triage issues and constantly ask people for more detail, that's time taken away from actually fixing issues. Help us be as efficient as possible by including a lot of detail in your issues.
 
diff --git a/docs/developer-guide/contributing/rule-changes.md b/docs/developer-guide/contributing/rule-changes.md
index 9973d784083c..cd3514b3710e 100644
--- a/docs/developer-guide/contributing/rule-changes.md
+++ b/docs/developer-guide/contributing/rule-changes.md
@@ -4,7 +4,7 @@ Occasionally, a core ESLint rule needs to be changed. This is not necessarily a
 
 ## Proposing a Rule Change
 
-To propose a change to an existing rule, [create a new issue](https://github.com/eslint/eslint/issues/new) or a [pull request](/docs/developer-guide/contributing/pull-requests.md) on GitHub. Be sure to copy the questions from the [rule change proposal template](https://github.com/eslint/eslint/blob/master/templates/rule-change-proposal.md).
+To propose a change to an existing rule, [create a new issue](https://github.com/eslint/eslint/issues/new?template=RULE_CHANGE.md) or a [pull request](/docs/developer-guide/contributing/pull-requests.md) on GitHub. Be sure to copy the questions from the [rule change proposal template](https://github.com/eslint/eslint/blob/master/templates/rule-change-proposal.md).
 
 We need all of this information in order to determine whether or not the change is a good candidate for inclusion.
 
diff --git a/templates/rule-change-proposal.md b/templates/rule-change-proposal.md
index 689e218a44c2..ee100011bc4f 100644
--- a/templates/rule-change-proposal.md
+++ b/templates/rule-change-proposal.md
@@ -17,3 +17,4 @@
 
 
 **What will the rule do after it's changed?**
+
diff --git a/templates/rule-proposal.md b/templates/rule-proposal.md
index 9814d592362f..383b1b4819c1 100644
--- a/templates/rule-proposal.md
+++ b/templates/rule-proposal.md
@@ -15,3 +15,4 @@
 ```
 
 **Why should this rule be included in ESLint (instead of a plugin)?**
+