diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 97c7c7bf..10ecc169 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,9 @@
 ---
 name: Bug report
-about: Create a report to help us improve Kimai
+about: Found a problem? Create a report to help us improve Kimai
+title: ''
+labels: bug
+assignees: ''
 
 ---
 
@@ -8,27 +11,17 @@ about: Create a report to help us improve Kimai
 A clear and concise description of what the bug is.
 
 **To Reproduce**
-Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. See error
 
 **Logfile**
 ```
-Add the last lines from your logfile at var/log/prod.log, around the time when the problem happened.
+Add the last lines from your logfile at "var/log/prod.log" or "Doctor > Logs", around the time when the problem happened.
 ```
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop/Smartphone**
-Please complete the following information if this seems to be a frontend issue:
- - Device: [e.g. iPhone6s]
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
 **Additional context**
-Add any other context about the problem here.
- - Kimai version
- - PHP version
+ - Kimai version: ?.? 
+ - PHP version: ?.?
+ - Device: [Ubuntu Laptop 16 inch, Windows Desktop 27 inch, iPhone 6s]
+ - Browser [e.g. Firefox 81, Chrome 85, Safari 14]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 35f82300..537120fc 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea to make Kimai better
+title: ''
+labels: feature request
+assignees: ''
 
 ---
 
@@ -13,5 +16,5 @@ 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.
+**Screenshot**
+Add a mockup / screenshot of your idea here.
diff --git a/.github/ISSUE_TEMPLATE/support---question.md b/.github/ISSUE_TEMPLATE/support---question.md
new file mode 100644
index 00000000..d1f0067a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/support---question.md
@@ -0,0 +1,18 @@
+---
+name: Support / Question
+about: Need help with your Kimai installation?
+title: ''
+labels: support
+assignees: ''
+
+---
+
+**Description**
+A clear and concise description of what the problem is.
+
+**Screenshot**
+Add a mockup / screenshot of your idea here
+
+**Additional context**
+ - Kimai version: ?.? 
+ - PHP version: ?.?