diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..c31045cf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+---
+
+_For general questions please use the [mail group](https://groups.google.com/forum/#!forum/parallel-ssh)._
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+1. Example code that produces error.
+2. Stack trace or error messages.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Actual behaviour**
+What actually happened.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional information**
+Include version of ``ssh2-python`` and any other relevant information.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..50838102
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Eg. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/issue_template.md b/.github/issue_template.md
deleted file mode 100644
index fae38a32..00000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,18 +0,0 @@
-### Directions
-
-_Issue tracker is for actionable bug reports, issues with the code and feature requests._
-_For general questions please use the [mail group](https://groups.google.com/forum/#!forum/parallel-ssh)._
-_Remove this section and everything on and above this line._
-
-### Bug reports
-
-__Steps to reproduce:__
-
-1. Example code that produces error.
-2. Stack trace or error messages.
-
-__Expected behaviour:__ [What was expected to happen.]
-
-__Actual behaviour:__ [What actually happened.]
-
-__Additional info:__ [Include version of ``ssh2-python`` and/or ``paramiko`` and any other relevant information.]