diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 6681c8e..ae3d354 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,20 +7,52 @@ assignees: ''
 
 ---
 
-# Before creating an issue
+<!-- 
+*** Before creating an issue ***
+*** Be sure the issue isn't yet reported here or dicussed on stackoverflow ***
+-->
 
-Be sure the issue isn't yet reported here or dicussed on stackoverflow
+**Setup information**
+<!-- Remove accordingly -->
+docker run / docker-compose / Helm
 
-# Logs
+**Describe the bug**
+A clear and concise description of what the bug is.
 
-Did you check the logs ?
-If any Error is present there please copy/paste it below 
+**To reproduce**
+Steps to reproduce the behavior:
+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/logs**
+If applicable, add screenshots to help explain your problem.
+
+<!-- Did you check the logs? If any Error is present there please copy/paste it below -->
 ```
 Any Error that sucks
 ```
 
-# Setup information
+**Docker/Kubernetes/Helm**:
+- Output of `docker version`:
+```
+(paste your output here)
+```
+<!-- Additional info if using helm on k8s, add the info below -->
+<!-- Delete this block if not applicable -->
+- Output of `helm version`:
+```
+(paste your output here)
+```
+- Output of `kubectl version`:
+```
+(paste your output here)
+```
+<!-- End Additional info if using helm on k8s -->
 
-What version do you run?
-Do you run docker-compose or a single Dockerfile ?
+**Additional context**
+Add any other context about the problem here.