diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f6e365af..5cb51e29 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,9 +7,75 @@ assignees: ''
---
-### Version
-Please provide your current version (can be found on the system page since v0.8.4)
-Version:
+## Version
+
+**Tandoor-Version:**
-### Bug description
+## Setup configuration
+
+
+### Setup
+- [ ] Docker / Docker-Compose
+- [ ] Unraid
+- [ ] Synology
+- [ ] Kubernetes
+- [ ] Manual setup
+- [ ] Others (please state below)
+
+### Reverse Proxy
+- [ ] No reverse proxy
+- [ ] jwilder's nginx proxy
+- [ ] Nginx proxy manager (NPM)
+- [ ] SWAG
+- [ ] Caddy
+- [ ] Traefik
+- [ ] Others (please state below)
+
+
+**Additional information:**
+
+## Bug description
A clear and concise description of what the bug is.
+
+
+
+## Logs
+
+
+
+ Web-Container-Logs
+
+
+
+ ```
+ Replace me with logs
+ ```
+
+
+
+ DB-Container-Logs
+
+
+
+ ```
+ Replace me with logs
+ ```
+
+
+
+ Nginx-Container-Logs
+
+
+
+ ```
+ Replace me with logs
+ ```
+