diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
deleted file mode 100644
index 31d3a30..0000000
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-⚠️ The main ClassQuizz instance at (https://classquiz.de) uses Sentry as a bug detection software, so please disable your AdBlocker if you want to ease the debug process ⚠️
-
-**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
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Stacktrace**
-If applicable, add the error stacktrace to help explain your problem.
-
-**Extra data (please complete the following information):**
- - Device [e.g. iPhone6, Desktop]:
- - Device OS [e.g. iOS8.1, Windows 10]:
- - Browser [e.g. Chrome, Firefox, Safari]:
- - ~~Classquiz Version [e.g. 0.10]:~~  :warning:** No versioning for now** :warning:
- - Classquiz installation [e.g. classquiz.de]:
- - Commit SHA [e.g : ed35c5c69019e7cd6331ea438519f53b8bce70cf]:
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..bbfc02c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,57 @@
+name: Bug Report
+description: File a bug report
+labels: ["bug"]
+body:
+  - type: input
+    attributes:
+      label: Which component is affected?
+      description: Which component/part of ClassQuiz is affected by the bug? The editor? The admin-screen if a game is running?
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Did the issue occur at ClassQuiz.de, or on a self-hosted instance?
+      options:
+        - On ClassQuiz.de
+        - On a self-hosted instance
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: How can the issue be reproduced?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the bug (with screenshots if possible)
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Device
+      options:
+        - Desktop
+        - Laptop/Notebook
+        - Smartphone
+        - Tablet
+        - Smartwatch
+        - Fridge/Toaster
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating System
+      placeholder: Windows, Linux, iOS, etc
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Browser
+      placeholder: Chrome, Safari, Firefox, etc
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: Additional
+    validations:
+      required: true