diff --git a/.github/ISSUE_TEMPLATE/----bug-report.md b/.github/ISSUE_TEMPLATE/----bug-report.md
new file mode 100644
index 000000000000..47c0c84c390b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/----bug-report.md
@@ -0,0 +1,54 @@
+---
+name: "\U0001F41E  Bug report"
+about: Report an issue with ESLint or rules bundled with ESLint
+
+---
+
+<!--
+    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 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 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.
+-->
+
+**Tell us about your environment**
+
+* **ESLint Version:**
+* **Node Version:**
+* **npm Version:**
+
+**What parser (default, Babel-ESLint, etc.) are you using?**
+
+**Please show your full configuration:**
+
+<details>
+<summary>Configuration</summary>
+
+<!-- Paste your configuration below: -->
+```js
+
+```
+
+</details>
+
+**What did you do? Please include the actual source code causing the issue, as well as the command that you used to run ESLint.**
+
+<!-- Paste the source code below: -->
+```js
+
+```
+
+<!-- Paste the command you used to run ESLint: -->
+```bash
+
+```
+
+**What did you expect to happen?**
+
+**What actually happened? Please include the actual, raw output from ESLint.**
diff --git a/.github/ISSUE_TEMPLATE/---new-rule-proposal.md b/.github/ISSUE_TEMPLATE/---new-rule-proposal.md
new file mode 100644
index 000000000000..2df235f39cbd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---new-rule-proposal.md
@@ -0,0 +1,36 @@
+---
+name: "\U0001F680 New rule proposal"
+about: Propose a new rule to be added to ESLint
+
+---
+
+<!--
+    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/---non-rule-change-request.md b/.github/ISSUE_TEMPLATE/---non-rule-change-request.md
new file mode 100644
index 000000000000..b5ae2ae832df
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---non-rule-change-request.md
@@ -0,0 +1,24 @@
+---
+name: "\U0001F4DD Non-rule change request"
+about: Request a change that is not a bug fix, rule change, or new rule
+
+---
+
+<!--
+    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.
+-->
+
+**The version of ESLint you are using.**
+
+**The problem you want to solve.**
+
+**Your take on the correct solution to problem.**
diff --git a/.github/ISSUE_TEMPLATE/---rule-change-request.md b/.github/ISSUE_TEMPLATE/---rule-change-request.md
new file mode 100644
index 000000000000..cc57bf53267e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---rule-change-request.md
@@ -0,0 +1,35 @@
+---
+name: "\U0001F4DD Rule change request"
+about: Request a change to an existing rule
+
+---
+
+<!--
+    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/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
index ef8c5101cd96..91f66d02cf1b 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -51,4 +51,4 @@ about: Report an issue with ESLint or rules bundled with ESLint
 
 **What did you expect to happen?**
 
-**What actually happened? Please include the actual, raw output from ESLint.**
\ No newline at end of file
+**What actually happened? Please include the actual, raw output from ESLint.**
diff --git a/.github/ISSUE_TEMPLATE/CHANGE.md b/.github/ISSUE_TEMPLATE/CHANGE.md
index 14cff91b0e06..0dffef40207f 100644
--- a/.github/ISSUE_TEMPLATE/CHANGE.md
+++ b/.github/ISSUE_TEMPLATE/CHANGE.md
@@ -22,4 +22,3 @@ about: Request a change that is not a bug fix, rule change, or new rule
 **The problem you want to solve.**
 
 **Your take on the correct solution to problem.**
-
diff --git a/.github/ISSUE_TEMPLATE/NEW_RULE.md b/.github/ISSUE_TEMPLATE/NEW_RULE.md
index 454b28e4090e..d6b7bf29ba2b 100644
--- a/.github/ISSUE_TEMPLATE/NEW_RULE.md
+++ b/.github/ISSUE_TEMPLATE/NEW_RULE.md
@@ -34,4 +34,3 @@ about: Propose a new rule to be added to ESLint
 ```
 
 **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
index 7b0c6537971d..160d3a9140f3 100644
--- a/.github/ISSUE_TEMPLATE/RULE_CHANGE.md
+++ b/.github/ISSUE_TEMPLATE/RULE_CHANGE.md
@@ -33,4 +33,3 @@ about: Request a change to an existing rule
 **What does the rule currently do for this code?**
 
 **What will the rule do after it's changed?**
-