diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
deleted file mode 100644
index 8fa650fd4a..0000000000
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: Bug report
-about: Help us improve the generated API clients.
----
-
-## Description
-
-<!-- A clear and concise description of what the bug is. -->
-
-## Steps to reproduce
-
-1. Use method `...`
-2. With parameters `...`
-3. See error
-
-## Expected behavior
-
-<!-- A clear and concise description of what you expected to happen. -->
-
-## Environment
-
-- OS: [e.g. Windows / Linux / macOS / iOS / Android]
-- Environment: [e.g. Browser / Node]
-- Client: [e.g. All / Recommend / Search / Insights]
-- Language: [e.g. JavaScript / PHP / Java]
-- Client version: [e.g. 5.0.0]
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.yml b/.github/ISSUE_TEMPLATE/Bug_report.yml
new file mode 100644
index 0000000000..9a62d2585a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.yml
@@ -0,0 +1,85 @@
+name: Bug Report
+description: File a bug report.
+title: '[bug]: '
+labels: ['bug', 'triage']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Please help us help you!
+
+        Before filing your issue, ask yourself:
+        - Is there an issue already opened for this bug?
+        - Can I reproduce it?
+
+        If you are not sure about the origin of the issue, or if it impacts your customer experience, please contact [our support team](https://alg.li/support).
+  - type: textarea
+    attributes:
+      label: Description
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: dropdown
+    id: language
+    attributes:
+      label: Language
+      description: In which API client are you able to reproduce the bug?
+      options:
+        - All
+        - CSharp
+        - Dart
+        - Go
+        - Java
+        - JavaScript
+        - Kotlin
+        - PHP
+        - Python
+        - Ruby
+        - Scala
+        - Swift
+    validations:
+      required: true
+  - type: dropdown
+    id: client
+    attributes:
+      label: Client
+      description: What API are you targetting?
+      options:
+        - All
+        - AB testing
+        - Analytics
+        - Ingestion
+        - Insights
+        - Monitoring
+        - Personalization
+        - Query-Suggestions
+        - Recommend
+        - Search
+        - Usage
+        - Crawler
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Write down the steps to reproduce the bug, please include any information that seems relevant for us to reproduce it properly
+      placeholder: |
+        1. Use method `...`
+        2. With parameters `...`
+        3. See error
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: checkboxes
+    attributes:
+      label: Self-service
+      description: |
+        If you feel like you could contribute to this issue, please check the box below. This would tell us and other people looking for contributions that someone's working on it.
+        If you do check this box, please send a pull request within 7 days so we can still delegate this to someone else.
+      options:
+        - label: I'd be willing to fix this bug myself.