diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 6bce7e6f1f..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,30 +0,0 @@
-In order to let us help you better, please fill out the following fields as best you can:
-
-### I am...
-
-* [ ] Reporting a bug
-* [ ] Suggesting a new feature
-* [ ] Requesting help with running my bot
-* [ ] Requesting help writing plugins
-* [ ] Here about something else
-
-### I am running...
-
-* Errbot version:
-* OS version:
-* Python version: 
-* Using a virtual environment: yes/no
-
-### Issue description
-
-Please describe your bug/feature/problem here.
-The more information you can provide, the better.
-
-### Steps to reproduce
-
-In case of a bug, please describe the steps we need to take in order to reproduce your issue.
-If you cannot easily reproduce the issue please let us know and provide as much information as you can which might help us pinpoint the problem.
-
-### Additional info
-
-If you have any more information, please specify it here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..fed91953e1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'type: bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Provide steps to reproduce the behavior or include sample plugin code.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment (please complete the following information):**
+- Errbot version:
+- OS version:
+- Python version: 
+- Using a virtual environment: yes/no
+- Using Docker: yes/no
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..cfeeefe57c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'type: feature'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Is feature related to**
+
+- [ ] Backend support
+- [ ] Plugins (storage, flows)
+- [ ] Functionality
+- [ ] Other
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/support---running-bot-or-plugins.md b/.github/ISSUE_TEMPLATE/support---running-bot-or-plugins.md
new file mode 100644
index 0000000000..59603715cf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/support---running-bot-or-plugins.md
@@ -0,0 +1,31 @@
+---
+name: Support - Running bot or plugins
+about: Requesting help with running errbot
+title: ''
+labels: 'type: support/question'
+assignees: ''
+
+---
+
+**Need help with**
+
+- [ ] Running the bot
+- [ ] Writing plugin
+- [ ] Other
+
+**Issue description**
+Please describe the issue. The more information you can provide, the better.
+
+**Steps to reproduce**
+Provide steps to reproduce the behavior or include sample plugin code.
+
+**Environment (please complete the following information):**
+- Errbot version:
+- OS version:
+- Python version:
+- Using a virtual environment: yes/no
+- Using Docker: yes/no
+
+
+**Additional info**
+If you have any more information, please specify it here.
diff --git a/CHANGES.rst b/CHANGES.rst
index ecf1cd4db4..58a28df430 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -24,6 +24,7 @@ fixes:
 - fix: python 2 version references in docs and init template (#1543)
 - backends: deprecate built-in Slack and SlackRTM (#1526)
 - chore: remove python 3.6 checks and test environment (#1540)
+- chore: add/update issue templates (#1554)
 
 v6.1.8 (2021-06-21)
 -------------------