diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
similarity index 61%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/BUG_REPORT.md
index 663c718..6c359d0 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -1,9 +1,14 @@
-### Are you in the right place?
-* For issues or feature requests file a GitHub issue in this repository
-* For general questions or discussion post on StackOverflow
+---
+name: Bug report
+about: Report something not working correctly or as expected
+title: ''
+labels: bug
+assignees: ''
+---
 
 ### Describe the problem
-A brief description of the issue/feature.
+
+A brief description of the issue.
 
 ### Steps to reproduce the problem
 
@@ -12,9 +17,11 @@ Your code here to reproduce the issue
 ```
 
 ### Actual behaviour
-What happened? This could be a description, log output, error raised etc...
+
+What happened? This could be a description, log output, error raised etc.
 
 ### Expected behaviour
+
 What did you expect to happen?
 
 ### Describe your environment
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
new file mode 100644
index 0000000..6bcd333
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest new functionality
+title: ''
+labels: enhancement
+assignees: ''
+---
+
+### Describe the problem
+
+A brief description of the problem you're trying to solve.
+
+### How would the new feature work?
+
+A short explanation of the new feature.
+
+```
+Example code that shows possible usage
+```
+
+### Drawbacks
+
+Can you see any potential drawbacks?
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..3ba13e0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false