diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index a3b1b7587..7a7bd61e8 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,38 +1,63 @@
 ---
-name: Bug report
-about: File a bug report
-title: ''
-labels: ''
-assignees: ''
+name: "\U0001F41B Bug report"
+about: Report a bug or a technical issue
 
 ---
 
+<!--
+Thank you for reporting a technical issue.
+
+This issue tracker is only for bug reports and problems. 
+
+For general questions please read our documentation docs.btcpayserver.org. You can ask technical questions in discussions https://github.com/btcpayserver/btcpayserver/discussions and general support on our community chat chat.btcpayserver.org
+
+Please fill in as much of the template below as you're able. 
+-->
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
+**To Reproduce a bug**
+Steps to reproduce the reported bug:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
 **Expected behavior**
+
+<!--
 A clear and concise description of what you expected to happen.
+-->
 
 **Screenshots**
+
+
+<!--
 If applicable, add screenshots to help explain your problem.
+-->
 
 **Your BTCPay Environment (please complete the following information):**
-- BTCPay Server Version: [available in the right bottom corner of footer] 
-- Deployment Method: [e.g. Docker, Manual, Third-Party-host]
-- Browser: [e.g. Chrome, Safari]
+- BTCPay Server Version:    <!--[available in the right bottom corner of footer] -->
+- Deployment Method:        <!--[e.g. Docker, Manual, Third-Party-host]-->
+- Browser:                  <!--[e.g. Chrome, Safari]-->
 
 **Logs (if applicable)**
-Basic logs can be found in Server Settings > Logs. More logs https://docs.btcpayserver.org/Troubleshooting/#2-looking-through-the-logs
+
+
+<!--
+Basic logs can be found in Server Settings > Logs. 
+More logs https://docs.btcpayserver.org/Troubleshooting/#2-looking-through-the-logs
+-->
 
 **Setup Parameters**
+
+<!--
 If you're reporting a deployment issue run `. btcpay-setup.sh -i` and paste the setup parameters here with your private information removed or obscured.
+-->
 
 **Additional context**
+
+<!--
 Add any other context about the problem here.
+-->
\ No newline at end of file