diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 71%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 215c8cf8e..45c83619e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,11 @@
-# This template is meant for bug reports, if you have a feature request, please be as descriptive as possible and delete the template
+---
+name: Bug report
+about: Create a report to help us improve
+labels: bug, needs triage
 
+---
 
+# This template is meant for bug reports, if you have a feature request user the other template.
 
 
 
@@ -16,8 +21,8 @@
 | Questions                 | Answers
 |---------------------------|--------------------
 | Type of issue             | Bug, Question, Feature Request, support...
-| OS version (server)       | Debian, ubuntu, CentOS, RedHat, ...
-| OS version (client)       | XP, Seven, 10, Ubuntu, ...
+| OS version (server)       | Debian, Ubuntu, CentOS, RedHat, ...
+| OS version (client)       | MacOS, Win10, Ubuntu, ...
 | PHP version               | 5.4, 5.5, 5.6, 7.0, 7.1...
 | MISP version / git hash   | 2.4.XX, hash of the commit
 | Browser                   | If applicable
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..d722eb063
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+labels: feature request, needs triage
+
+---
+
+**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**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+