diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 2a02e0226..94800468f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,6 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-
 ---
 
 <!--
@@ -10,10 +9,16 @@ about: Create a report to help us improve
   To make sure it's not, run: yarn eslint src/your-file.vue
 -->
 
+**Checklist**
+
+- [ ] I checked the [FAQ](https://eslint.vuejs.org/user-guide/#faq).
+
 **Tell us about your environment**
-* **ESLint version:** 
-* **eslint-plugin-vue version:** 
-* **Node version:** 
+
+- **ESLint version:** 
+- **eslint-plugin-vue version:** 
+- **Node version:** 
+- **Operating System:** 
 
 **Please show your full configuration:**
 <!-- Paste content of your .eslintrc file -->
@@ -31,4 +36,10 @@ about: Create a report to help us improve
 
 
 **What actually happened?**
-<!-- Please include the actual, raw output from ESLint. -->
+<!--
+  Please include the actual, raw output from ESLint.
+  If you are only looking at the results of your editor extension, also check the CLI results.
+-->
+
+**Repository to reproduce this issue**
+
diff --git a/.github/ISSUE_TEMPLATE/change.md b/.github/ISSUE_TEMPLATE/change.md
new file mode 100644
index 000000000..a6a4a7dc0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/change.md
@@ -0,0 +1,26 @@
+---
+name: "Non-rule change request"
+about: Request a change that is not a bug fix, rule change, or new rule
+---
+
+<!--
+  Before proposing changes, please make sure it hasn't been posted already.
+  You can see all open propositions here:
+  https://github.com/vuejs/eslint-plugin-vue/issues?q=is%3Aopen+is%3Aissue+label%3A%22new+rule+proposition%22
+-->
+
+**Tell us about your environment**
+
+- **ESLint version:** 
+- **eslint-plugin-vue version:** 
+- **Node version:** 
+
+**The problem you want to solve.**
+
+
+**Your take on the correct solution to problem.**
+
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->
+
diff --git a/.github/ISSUE_TEMPLATE/rule-change.md b/.github/ISSUE_TEMPLATE/rule-change.md
new file mode 100644
index 000000000..78a3a2dd1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/rule-change.md
@@ -0,0 +1,31 @@
+---
+name: "Rule change request"
+about: Request a change to an existing rule
+---
+
+<!--
+  Before proposing rule changes, please make sure it hasn't been posted already.
+  You can see all open propositions here:
+  https://github.com/vuejs/eslint-plugin-vue/issues?q=is%3Aopen+is%3Aissue+label%3A%22new+rule+proposition%22
+-->
+
+**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 -->
+```vue
+
+```
+
+**What does the rule currently do for this code?**
+
+**What will the rule do after it's changed?**
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->
+
diff --git a/.github/ISSUE_TEMPLATE/rule-proposal.md b/.github/ISSUE_TEMPLATE/rule-proposal.md
index 7130c789f..6c571721c 100644
--- a/.github/ISSUE_TEMPLATE/rule-proposal.md
+++ b/.github/ISSUE_TEMPLATE/rule-proposal.md
@@ -1,7 +1,6 @@
 ---
 name: Rule Proposal
 about: Suggest an idea for a new rule
-
 ---
 
 <!--
@@ -15,15 +14,17 @@ about: Suggest an idea for a new rule
 
 **What category should the rule belong to?**
 <!-- (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:)
+[ ] Enforces code style (layout)
+[ ] Warns about a potential error (problem)
+[ ] Suggests an alternate way of doing something (suggestion)
+[ ] Other (please specify:)
 
 **Provide 2-3 code examples that this rule should warn about:**
+
 ```vue
 
 ```
 
 **Additional context**
 <!-- Add any other context or screenshots about the feature request here. -->
+