diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index ec1adc8dfb..77402dd6fd 100755
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,16 +1,34 @@
-**Node.js version**:
+<!-- Chose BUG or FEATURE REQUEST template and delete the one you don't use-->
+<!-- ⚠️ Don't forgot the checkbox at the end of your issue -->
 
-**npm version**:
+*BUG TEMPLATE* <!-- Delete this header from your issue -->
 
-**Strapi version**:
+<!-- ⚠️ Before writing your issue make sure you are using :-->
+<!-- Node 9.x.x -->
+<!-- npm 5.x.x -->
+<!-- The latest version of Strapi -->
 
-**Operating system**:
-
-
-**Do you want to request a *feature* or report a *bug*?**
+**Informations**
+- **Node.js version**:
+- **npm version**:
+- **Strapi version**:
+- **Database**:
+- **Operating system**:
 
 **What is the current behavior?**
 
-**If the current behavior is a bug, please provide the steps to reproduce the problem**
+**Steps to reproduce the problem**
 
 **What is the expected behavior?**
+
+---
+
+*FEATURE REQUEST TEMPLATE*  <!-- Delete this header from your issue -->
+
+**What is the expected behavior?**
+
+---
+
+- [ ] I'm sure that this issue hasn't already been referenced
+<!-- ⬆️ Don't delete this checkbox from your issue and approve it.  -->
+<!-- ⚠️ Make sure to browse the opened and closed issues. -->