diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 8ea04d7f..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Please fill in this template as much as you can, to help us, help you.
-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.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-Please do not link to image hosting sites, as these can be ephemeral. Instead, attach them to the issue. 
-
-**Desktop (please complete the following information):**
-
- - OS: [e.g. Windows]
-- Barrier version [e.g 2.3.3]
-
-**Additional context**
-
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 00000000..ff47b93f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,70 @@
+name: Bug Report
+description: File a bug report (ideally refrain from questions, please use IRC or Matrix for those)
+title: "[Bug]: "
+labels: [bug, triage]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see! Screenshots are also helpful - please attach to the issue.
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of Barrier are you runnning?
+      options:
+        - v2.0.0-RC1
+        - v2.0.0-RC2
+        - v2.0.0
+        - v2.1.1
+        - v2.1.2
+        - v2.3.0
+        - v2.3.1
+        - v2.3.2-alpha
+        - v2.3.2
+        - v2.3.3
+        - From Git HEAD or commit (specify below)
+    validations:
+      required: true
+  - type: input
+    id: git-commit-if
+    attributes:
+        label: Git commit hash (if applicable)
+        description: "When building Barrier from Git, what commit hash did you checkout from?"
+        placeholder: b0c0b42b
+    validations:
+        required: false
+  - type: dropdown
+    id: os
+    attributes:
+      label: What OSes are you seeing the problem on? (Check all that apply).
+      multiple: true
+      options:
+        - Linux
+        - Windows
+        - macOS
+    validations:
+        required: true
+  - type: textarea
+    id: os-version
+    attributes:
+        label: What OS versions are you using?
+        description: This applies to both client(s) and the server.
+    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
+