diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index bb5a6e196..ada9bccf1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,21 +1,30 @@
-Environment
------------
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: Kind:Bug
+assignees: ''
+
+---
+
+## Environment
+
 - ejabberd version: 18.09
 - Erlang version: `erl +V`
 - OS: Linux (Debian)
 - Installed from: source | distro package | official deb/rpm | official binary installer | other
 
-Configuration (only if needed): grep -Ev '^$|^\s*#' ejabberd.yml
----------------------------------------------------------------------------
+## Configuration (only if needed): grep -Ev '^$|^\s*#' ejabberd.yml
+
 ```yaml
 loglevel: 4
 ...
 ```
 
-Errors from error.log/crash.log
--------------------------------
+## Errors from error.log/crash.log
+
 No errors
 
-Bug description
----------------
-Nothing works, plz halp :(
+## Bug description
+
+Please, make us e a precise description (what does not work, what is expected, etc.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 751cb5de0..da5b6ff25 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-labels: 
+title: ''
+labels: Kind:Feature
+assignees: ''
 
 ---