diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index da8da6850..5cbe6e76c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,12 +1,14 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: 'BUG: '
+title: Bug/
 labels: bug
 assignees: ''
 
 ---
 
+Please, start your issue with the impacted component name (cscli, crowdsec ..)
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..dcf1a1fc9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: Improvment/
+labels: ''
+assignees: ''
+
+---
+
+Please, start your issue name with the component name impacted by this feature request
+
+**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.
+
+**Describe alternatives you've considered** (Optional) 
+A clear and concise description of any alternative solutions or features you've considered.
+
+** Example of what you imagine **
+If applicable, add an example of what you would expect from this feature request.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.