diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index f218f15d2..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**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.
-
-**EVCC details:**
-Show output of <code>evcc -v</code>:
-```
-<- paste here
-
-```
-
-<details><summary>Show output of <code>evcc dump -c configfile</code>:</summary><br><pre>
-<- paste here
-
-</pre></details>
-
-<details><summary>Show evcc configuration file <code>evcc.yaml</code>:</summary><br><pre>
-<- paste here
-
-</pre></details>
-
-<details><summary>Show evcc log output with <code>--log debug</code>:</summary><br><pre>
-<- paste here
-
-</pre></details>
-
-**If using Docker:**
-Show output of <code>docker run andig/evcc -v</code>:
-```
-<- paste here
-
-```
-
-<details><summary>Show evcc log output with <code>docker logs <container id></code>:</summary><br><pre>
-<- paste here
-
-</pre></details>
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 000000000..4cd43f0bb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,61 @@
+name: Bug report
+description: Create a report to help us improve
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This issue form is for reporting bugs only!
+
+        If you want to start a discussion or ask a question, please use the [discussion forum][df].
+
+        [df]: https://github.com/evcc-io/evcc/discussions
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the bug
+      description: >-
+        A clear and concise description of what the bug is.
+
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Steps to reproduce
+      description: >-
+        Steps to reproduce the behavior.
+
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Configuration details
+      description: >
+        Show evcc configuration file <code>evcc.yaml</code>
+
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Log details
+      description: >
+        Show evcc log output by running with <code>evcc --log debug</code>
+
+  - type: dropdown
+    validations:
+      required: true
+    attributes:
+      label: What type of operating system are you running?
+      description: >
+        Note that if you're using Docker we ask you to reproduce the problem without Docker first.
+      options:
+        - Linux
+        - Windows
+        - Docker container
+
+  - type: textarea
+    attributes:
+      label: Version
+      description: >
+        Show output of <code>evcc -v</code>