diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 90d0817..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: t/bug
-assignees: ''
-
----
-
-<!-- PLEASE UPDATE to the latest version of OrbStack BEFORE reporting -->
-
-**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.
-
-**Logs**
-Attach log files by opening OrbStack's Help menu and clicking “Show Logs”, or [email](https://orbstack.dev/email/logs) them for privacy.
-
-**PLEASE ATTACH THE ENTIRE LOG FILE WITHOUT REMOVING ANY LINES.** There is usually important context earlier in the log.
-
-**Info report**
-<!-- Run the "orb report" command in a terminal, then copy and paste the output below. -->
-```
-<paste here>
-```
-
-**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..20f4ec0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,68 @@
+name: Bug report
+description: Create a report to help us improve
+labels: ["t/bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+        **Please update OrbStack** to the latest version **before** reporting.
+  - type: textarea
+    id: describe
+    attributes:
+      label: Describe the bug
+      description: What went wrong?
+      placeholder: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: false
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: What should have happened?
+      placeholder: |
+        A clear and concise description of what you expected to happen.
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs
+      description: |
+        Attach a log file by opening OrbStack's Help menu and clicking “Show Logs”, or [email](https://orbstack.dev/email/logs) them for privacy.
+
+        **PLEASE ATTACH THE ENTIRE LOG FILE WITHOUT REMOVING ANY LINES.** There is usually important context earlier in the log.
+      placeholder: |
+        Upload log file here.
+  # - type: textarea
+  #   id: diag
+  #   attributes:
+  #     label: Diagnostic report (REQUIRED)
+  #     description: |
+  #       Click "Collect Diagnostics" in OrbStack's Help menu (or run the "orb report" command), then paste the output here.
+
+  #       This is private and only OrbStack developers can see the report.
+  #     placeholder: |
+  #       REQUIRED. Paste here.
+  #   validations:
+  #     required: false
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context (optional)
+      description: Add any other context about the problem here.
+    validations:
+      required: false