diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 45af7c51e7..2399435d32 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,4 +1,4 @@
-name: Bug Report
+name: Bug report
 description: For issues with running openpilot on your comma device
 labels: ["bug"]
 body:
diff --git a/.github/ISSUE_TEMPLATE/car_bug_report.md b/.github/ISSUE_TEMPLATE/car_bug_report.md
deleted file mode 100644
index 3dfbf23b0d..0000000000
--- a/.github/ISSUE_TEMPLATE/car_bug_report.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: Car bug report
-about: For issues with a particular car or make
-title: ''
-labels: 'car bug'
-assignees: ''
----
-
-**Describe the bug**
-
-<!-- A clear and concise description of what the bug is. -->
-
-**How to reproduce or log data**
-
-<!-- Steps to reproduce the behavior. -->
-
-**Device/Version information (please complete the following information):**
- - Device: [e.g. EON/EON Gold/comma two]
- - Dongle ID: [e.g. 77611a1fac303767, can be found in Settings -> Device -> Dongle ID or my.comma.ai/useradmin]
- - Route: [e.g. 77611a1fac303767|2020-05-11--16-37-07, can be found in my.comma.ai/useradmin]
- - Timestamp: [When in the route the bug occurs (e.g. 4min 30s into the drive)]
- - Version: [commit hash when on a non-release branch, or version number when on devel or release2 (e.g. 0.7.6)]
- - Car make/model: [e.g. Toyota Prius 2016]
-
-<!-- Ensure the full logs are uploaded for the posted route. To do so, ensure the Upload Raw Logs toggle is on and connect the device to wifi until all four colums in my.comma.ai/useradmin are filled. -->
-
-**Additional context**
-
-<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/car_bug_report.yml b/.github/ISSUE_TEMPLATE/car_bug_report.yml
new file mode 100644
index 0000000000..39b92cae76
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/car_bug_report.yml
@@ -0,0 +1,65 @@
+name: Car bug report
+description: For issues with a particular car make or model
+labels: ["car bug"]
+body:
+
+  - type: markdown
+    attributes:
+      value: >
+        Before creating a **bug report**, please check the following:
+          * Ensure you're running the latest openpilot release.
+          * Ensure you're using officially supported hardware. Issues running on PCs have a different issue template.
+          * Ensure there isn't an existing issue for your bug. If there is, leave a comment on the existing issue.
+          * Ensure you're running stock openpilot. We cannot look into bug reports from forks.
+
+        If you're unsure whether you've hit a bug, check out the #installation-help channel in the [community Discord server](https://discord.comma.ai).
+
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: Also include a description of how to reproduce the bug
+    validations:
+      required: true
+
+  - type: dropdown
+    id: hw
+    attributes:
+      label: What hardware does this issue affect?
+      multiple: false
+      options:
+        - comma three
+        - comma two
+        - EON Gold
+    validations:
+      required: true
+
+  - type: input
+    id: car
+    attributes:
+      label: Which car does this affect?
+      placeholder: Toyota Prius 2017
+    validations:
+      required: true
+
+  - type: input
+    id: route
+    attributes:
+      label: Provide a route where the issue occurs
+      description: Ensure the route is fully uploaded
+      placeholder: 77611a1fac303767|2020-05-11--16-37-07
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: openpilot version
+      description: If you're not on release, provide the commit hash
+      placeholder: 0.8.10
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional info
+
diff --git a/.github/ISSUE_TEMPLATE/pc_bug_report.md b/.github/ISSUE_TEMPLATE/pc_bug_report.md
deleted file mode 100644
index 0a6709b845..0000000000
--- a/.github/ISSUE_TEMPLATE/pc_bug_report.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: PC Bug report
-about: For issues with running openpilot on PC
-title: ''
-labels: 'PC'
-assignees: ''
----
-
-**Describe the bug**
-
-<!-- A clear and concise description of what the bug is. Add the `simulation` label if running in an environment like CARLA. -->
-
-**How to reproduce or log data**
-
-<!-- Steps to reproduce the behavior. -->
-
-**Additional context**
-
-<!-- Add any other context about the problem here. -->
-
-Operating system: [e.g. Ubuntu 16.04]
diff --git a/.github/ISSUE_TEMPLATE/pc_bug_report.yml b/.github/ISSUE_TEMPLATE/pc_bug_report.yml
new file mode 100644
index 0000000000..db3eb22e5c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/pc_bug_report.yml
@@ -0,0 +1,42 @@
+name: PC bug report
+description: For issues with running openpilot on PC
+labels: ["PC"]
+body:
+
+  - type: markdown
+    attributes:
+      value: >
+        Before creating a **bug report**, please check the following:
+          * Ensure you're running the latest openpilot release.
+          * Ensure there isn't an existing issue for your bug. If there is, leave a comment on the existing issue.
+          * Ensure you're running stock openpilot. We cannot look into bug reports from forks.
+
+        If you're unsure whether you've hit a bug, check out the #installation-help channel in the [community Discord server](https://discord.comma.ai).
+
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: Also include a description of how to reproduce the bug
+    validations:
+      required: true
+
+  - type: input
+    id: os-version
+    attributes:
+      label: OS Version
+      placeholder: Ubuntu 20.04
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: openpilot version or commit
+      placeholder: bd36f2ec8d3559909678eff2690c10a520938367
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional info
+