diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 9da561e0ac..8e3ff067f6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,29 +6,55 @@ labels: Bug
 assignees: ''
 
 ---
+<!--
+Please fill out this template with all the information you have. The more info you can provide the easier it will be to help you out or fix the problem you are seeing. For trouble with the UI don’t forget to add a screenshot or two. Please do your best!
 
-### Expected behavior
+Please note that this template is only for bugs. Please use other templates in case of feature requests or support requests
 
-<!-- Describe in detail what the correct behavior should be. -->
+Lastly, be sure to preview your issue before saving. Thanks!
+-->
 
-### Actual behavior
+- [ ] I have searched open and closed issues for duplicates
 
-<!-- Describe the details of the buggy behaviour. -->
+<!--
+  You can search all issues here
+  https://github.com/friendica/friendica/issues?utf8=%E2%9C%93&q=is%3Aissue
+  Replace [ ] with [X] once you've searched
+-->
 
-### Steps to reproduce the problem
+### Bug Description
+
+<!-- Give an overall summary of the issue. -->
+
+### Steps to Reproduce
 
 <!-- Using bullet points, list the steps that reproduce the bug. -->
 
-1. step one
-2. step two
-3. step three
+1.  step one
+2.  step two
+3.  step three
+
+Actual Result:
+
+<!-- Describe the details of the buggy behaviour. -->
+
+Expected Result:
+
+<!-- Describe in detail what the correct behavior should be. -->
+
+### Screenshots
+
+<!-- How to take screenshots on all OSes: https://www.take-a-screenshot.org/
+You can drag and drop images into this text box. -->
 
 ### Platform Info
 
-Friendica Version: <!-- You can see Friendica’s version number at Help -> About this site -> Site/Friendica Version -->
+Friendica Version:
 
-Friendica source (git, zip):
+<!-- You can see Friendica’s version number at Help -> About this site -> Site/Friendica Version -->
 
-PHP version: 
+Friendica Source: 
+
+PHP version:
 
 SQL version: