diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 63%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index b478978a5..ded04c7a1 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,26 +1,26 @@
+---
+name: Bug report
+about: Create a report to help us improve
+---
+
 <!--
-1. If you have a question and not a bug/feature request please ask it at http://forum.serverless.com
-2. Please check if an issue already exists so there are no duplicates
+1. If you have a question and not a bug report please ask first at http://forum.serverless.com
+2. Please check if an issue already exists. This bug may have already been documented
 3. Check out and follow our Guidelines: https://github.com/serverless/serverless/blob/master/CONTRIBUTING.md
 4. Fill out the whole template so we have a good overview on the issue
 5. Do not remove any section of the template. If something is not applicable leave it empty but leave it in the Issue
 6. Please follow the template, otherwise we'll have to ask you to update it
 -->
 
-# This is a (Bug Report / Feature Proposal)
+# This is a Bug Report
 
 ## Description
 
-For bug reports:
 * What went wrong?
 * What did you expect should have happened?
 * What was the config you used?
 * What stacktrace or error message from your provider did you see?
 
-For feature proposals:
-* What is the use case that should be solved. The more detail you describe this in the easier it is to understand for us.
-* If there is additional config how would it look
-
 Similar or dependent issues:
 * #12345
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..1374800f2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for serverless framework
+---
+
+<!--
+1. If you have a question and not a feature request please ask first at http://forum.serverless.com
+2. Please check if an issue already exists. This feature may have already been requested
+3. Check out and follow our Guidelines: https://github.com/serverless/serverless/blob/master/CONTRIBUTING.md
+4. Fill out the whole template so we have a good overview on the issue
+5. Do not remove any section of the template. If something is not applicable leave it empty but leave it in the Issue
+6. Please follow the template, otherwise we'll have to ask you to update it
+-->
+
+# This is a Feature Proposal
+
+## Description
+
+* What is the use case that should be solved. The more detail you describe this in the easier it is to understand for us.
+* If there is additional config how would it look
+
+Similar or dependent issues:
+* #12345