diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index cee42dd33141..000000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Bug Report
-about: Create a bug report for Rust GCC
-labels: bug
----
-<!--
-Thank you for filing a bug report! 🐛 Please provide a short summary of the bug,
-along with any information you feel relevant to replicating the bug.
--->
-
-I tried this code:
-
-```rust
-<code>
-```
-
-I expected to see this happen: *explanation*
-
-Instead, this happened: *explanation*
-
-### Meta
-
-- What version of Rust GCC were you using, git sha if possible.
-
-
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000000..1ca211355f40
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,64 @@
+name: Bug Report
+description: Create a bug report
+body:
+  - type: markdown
+    attributes:
+      value: Thank you for filing a bug report! 🐛
+  - type: textarea
+    id: problem
+    attributes:
+      label: Summary
+      description: >
+        Please provide a short summary of the bug, along with any information
+        you feel relevant to replicate the bug.
+    validations:
+      required: true
+  - type: textarea
+    id: reproducer
+    attributes:
+      label: Reproducer
+      description: Please provide the code and steps to reproduce the bug
+      value: |
+        I tried this code:
+
+        ```rust
+        <code>
+        ```
+  - type: checkboxes
+    id: nightly-features
+    attributes:
+      label: Does the code make use of any (1.49) nightly feature ?
+      options:
+      - label: Nightly
+  - type: input
+    id: godbolt
+    attributes:
+      label: Godbolt link
+      description: Optional link to godbolt snippet
+      placeholder: |
+        https://godbolt.org/z/vnK433Wox
+  - type: textarea
+    id: obtained
+    attributes:
+      label: Actual behavior
+      description: Please describe the actual behavior
+      value: |
+        The current behavior is...
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: Please describe the expected behavior
+      value: |
+        I expected to see...
+  - type: input
+    id: version
+    attributes:
+      label: GCC Version
+      description: "GCC version (`gcc --version`) or commit SHA"
+      placeholder: |
+        commit-hash: c4fecaf3c4fec4f3caf3c4fec4f3cafec4fecaf3
+    validations:
+      required: true