diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 9a3407f13..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-    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:
-
-    1. To propose a new rule: http://eslint.org/docs/developer-guide/contributing/new-rules
-    2. To request a change: http://eslint.org/docs/developer-guide/contributing/changes
-
-    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:**
-* **eslint-plugin-vue Version:**
-* **Node Version:**
-
-**Please show your full configuration:**
-
-<!-- Paste your configuration below: -->
-```
-
-
-
-
-```
-
-**What did you do? Please include the actual source code causing the issue.**
-
-<!-- Paste the source code below: -->
-```vue
-
-
-
-
-
-```
-
-**What did you expect to happen?**
-
-**What actually happened? Please include the actual, raw output from ESLint.**
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..1dd689274
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+<!--
+  Before posting the issue, please confirm that the problem you're getting
+  is not related with your code editor configuration.
+  To make sure it's not, run: yarn eslint src/your-file.vue
+-->
+
+**Tell us about your environment**	
+* **ESLint version:**	
+* **eslint-plugin-vue version:**	
+* **Node version:**	
+
+**Please show your full configuration:**
+<!-- Paste content of your .eslintrc file -->
+```json
+
+```
+
+**What did you do?**	
+<!-- Please include the actual source code causing the issue. -->
+```vue
+
+```
+
+**What did you expect to happen?**
+
+
+**What actually happened?**
+<!-- Please include the actual, raw output from ESLint. -->
diff --git a/.github/ISSUE_TEMPLATE/rule-proposal.md b/.github/ISSUE_TEMPLATE/rule-proposal.md
new file mode 100644
index 000000000..7130c789f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/rule-proposal.md
@@ -0,0 +1,29 @@
+---
+name: Rule Proposal
+about: Suggest an idea for a new rule
+
+---
+
+<!--
+  Before proposing new rule, 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
+-->
+
+**Please describe what the rule should do:**
+<!-- A clear and concise description of what the rule should do. -->
+
+**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:)
+
+**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. -->