diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b10469f..fd3a37e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,33 +1,34 @@
 ---
 name: Bug report
 about: Create a report to help us improve
+title: ''
+labels: "Bug \U0001F4A5"
+assignees: BONNe
 
 ---
 
-**Description**
-A clear and concise description of what the bug is.
+### Description
+<!-- A clear and concise description of what the bug is. -->
+<!-- Please type below this line. -->
 
-**Steps to reproduce the behavior:**
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+#### Steps to reproduce the behavior:
+<!-- A clear steps how problem can be replicated: -->
+<!-- 1. Edit challenge -->
+<!-- 2. Try to complete challenge -->
+<!-- 3. Error: -->
+<!-- Please type below this line. -->
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+### Server / BentoBox information:
+<!-- Please provide information from `/bentobox version`  -->
+<!-- Please provide information about database type for BentoBox plugin  -->
+<!-- Please provide information about other plugins `/pl`  -->
+<!-- Please type below this line. -->
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+### Screenshots / Server log
+<!-- Any screenshots or videos that could help to diagnostic issue -->
+<!-- Server log could help to diagnostic issue a lot faster  -->
+<!-- Please add links or images below this line. -->
 
-**Server Information:**
-
-[Please complete the following information:]
- - Database being used (YAML, JSON, MySQL, MongoDB): []
- - OS: [e.g. iOS]
- - Java Version: [e.g. Java 8]
- - BentoBox version: [e.g. 1.7.2.21]
- - Addons installed? [Do '/bentobox version' and copy/paste from the console]
- - Other plugins? [Do '/plugins' and copy/paste from the console]
-
-**Additional context**
-Add any other context about the problem here.
+### Expected behavior / Additional context
+<!-- Add any other context about the problem here. -->
+<!-- Please type below this line. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 066b2d9..de77768 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,17 +1,25 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
+title: ''
+labels: Enhancement ✨
+assignees: ''
 
 ---
 
-**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 [...]
+### Description
+#### Is your feature request related to a problem?
+<!-- A clear and concise description of the problem you're encountering, if any. -->
+<!-- Please type below this line. -->
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+#### Describe the solution you'd like us to implement.
+<!-- A clear and concise description of what you want us to do to resolve your problem. -->
+<!-- Please type below this line. -->
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+#### Describe alternatives you've considered.
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+<!-- Please type below this line -->
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+### Additional context
+<!-- Add any other context or screenshots about the feature request here. -->
+<!-- Please type below this line. -->