diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/Bug_report.md
similarity index 64%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/Bug_report.md
index 24874a25..aa724856 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -1,4 +1,4 @@
-**Notice (you can delete this paragraph)**
+**Notice**
 Please understand that we use GitHub as **bug tracker and for feature requests only**.
 For general (community) support and other discussion, you are welcome to visit us @ Freenode, #mailcow
 Answering may take from a few seconds to hours, please be patient. :-)
@@ -7,12 +7,11 @@ Immediate commercial support is available via mailcow@incidents.servercow.de
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+**How to reproduce Reproduce**
+Steps to reproduce the behavior please explain how to reproduce the bug:
+1. ....
+2. ....
+3. ....
 
 **Expected behavior**
 A clear and concise description of what you expected to happen.
@@ -20,6 +19,9 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
+**Logs**
+Please post the logs to https://pastebin.com and paste the link here. Logs can be optained by using docker-compose logs --tail="100" <containername>. Please replace <containername> with the container name, you can find that by using docker-compose ps .
+
 **System**
  - OS: [e.g. iOS]
  - Browser: [e.g. chrome, safari]
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 00000000..860ab66b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**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.
+
+**Additional context**
+Add any other context or screenshots about the feature request here or remove this section