diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 862c0600f24a..2ce6e4427a93 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,33 +1,2 @@
-<!-- THIS INFORMATION IS MANDATORY - YOUR ISSUE WILL BE CLOSED IF IT IS MISSING. If you don't know your Rasa version, use `pip list | grep rasa`. Removing the below information is allowed for FEATURE REQUESTS. Please format any code or console output with the three ticks ``` above and below. -->
-
-**Rasa version**:
-
-**Rasa X version** (if used & relevant):
-
-**Python version**:
-
-**Operating system** (windows, osx, ...):
-
-**Issue**:
-
-
-
-**Error (including full traceback)**:
-```
-
-```
-
-**Command or request that led to error**:
-```
-
-```
-
-**Content of configuration file (config.yml)** (if relevant):
-```yml
-
-```
-
-**Content of domain file (domain.yml)** (if relevant):
-```yml
-
-```
+<!-- IF YOU ARE ASKING A USAGE QUESTION (E.G. "HOW DO I DO XYZ") PLEASE POST
+YOUR QUESTION ON https://forum.rasa.com INSTEAD -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000000..1584bc419b29
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,44 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!-- THIS INFORMATION IS MANDATORY - YOUR ISSUE WILL BE CLOSED IF IT IS MISSING. If you don't know your Rasa version, use `pip list | grep rasa`. 
+Please format any code or console output with three ticks ``` above and below. 
+If you are asking a usage question (e.g. "How do I do xyz") please post your question on https://forum.rasa.com instead -->
+
+**Rasa version**:
+
+**Rasa X version** (if used & relevant):
+
+**Python version**:
+
+**Operating system** (windows, osx, ...):
+
+**Issue**:
+
+
+
+**Error (including full traceback)**:
+```
+
+```
+
+**Command or request that led to error**:
+```
+
+```
+
+**Content of configuration file (config.yml)** (if relevant):
+```yml
+
+```
+
+**Content of domain file (domain.yml)** (if relevant):
+```yml
+
+```
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000000..9c99d081cfae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,31 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'enhancement'
+assignees: ''
+
+---
+
+**Description of Problem**:
+Short overview of the current situation.
+Why is this feature needed? Please link any relevant
+[forum](https://forum.rasa.com) threads here.
+
+**Overview of the Solution**:
+What would a possible solution look like?
+Describe, without going too low into technical details,
+what changes need to happen during implementation of this feature.
+
+**Examples** (if relevant):
+List examples and/or link to relevant references.
+
+**Blockers** (if relevant):
+Is this feature blocked by anything or anyone?
+Or might there be any potential blockers on the way?
+
+**Definition of Done**:
+What needs to be there to consider this feature as done?
+- [ ] Tests are added
+- [ ] Feature is documented
+- [ ] ...