diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index dce478566..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- PLEASE READ THE FOLLOWING INSTRUCTIONS -->
-
-<!--Make sure you have the latest Buefy release-->
-<!--Make sure the issue hasn't been raised yet-->
-<!--Use English for communication-->
-<!--Include screenshots or animated GIFs (if visual issue)-->
-
-### Overview of the problem
-
-**Buefy** version: [X.X.X]
-**Vuejs** version: [X.X.X]
-**OS/Browser**:
-
-### Description
-
-<!--Description of the bug, improvement, or question-->
-
-### Steps to reproduce
-
-<!--
-1. First Step
-2. Second Step
-3. and so on...
--->
-
-### Expected behavior
-
-<!--What you expected to happen-->
-
-### Actual behavior
-
-<!--What actually happened-->
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
new file mode 100644
index 000000000..58a1f30de
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -0,0 +1,42 @@
+---
+name: Bug report
+about: Create a report to help us improve Buefy
+labels: bug
+---
+
+<!-- PLEASE READ THE FOLLOWING INSTRUCTIONS -->
+
+<!--
+- Try to search for your issue, it may have already been answered or even fixed in the development version.
+- Check if the issue is reproducible with the latest stable version of Buefy.
+- It is **required** that you clearly describe the steps necessary to reproduce the issue.
+- It is recommended that you make a screenshots/animated GIFs/JSFiddle/JSBin/Codepen to demonstrate your issue.
+- If your issue is resolved but still open, don’t hesitate to close it. In case you found a solution by yourself, it could be helpful to explain how you fixed it.
+- Use English for communication
+-->
+
+### Overview of the problem
+
+**Buefy** version: [X.X.X]
+**Vuejs** version: [X.X.X]
+**OS/Browser**:
+
+### Description
+
+<!--Description of the bug-->
+
+### Steps to reproduce
+
+<!--
+1. First Step
+2. Second Step
+3. and so on...
+-->
+
+### Expected behavior
+
+<!--What you expected to happen-->
+
+### Actual behavior
+
+<!--What actually happened-->
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
new file mode 100644
index 000000000..54366683a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea to improve Buefy
+labels: feature request
+---
+
+<!-- PLEASE READ THE FOLLOWING INSTRUCTIONS -->
+
+<!--
+- It is recommended that you provide screenshots or code samples to demonstrate your issue.
+- Use English for communication
+-->
+
+### Description
+
+<!--Description of the feature-->
+
+### Why Buefy need this feature
+
+<!--Explain why Buefy needs it-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..329ec2fc0
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,10 @@
+<!-- Thank you for helping Buefy! -->
+
+Fixes #
+<!-- If this PR fixes GitHub issue 1234, add "Fixes #1234" to the next line. -->
+
+## Proposed Changes
+
+-
+-
+-