diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 6f2e01b3f..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-name: Bug Report
-about: Create a report to help us improve
-labels: 'type: bug, issue: triage'
-assignees: ''
-
----
-
-<!--
-  - Thanks for opening an issue for us!  Before you open an issue,
-  - please check if a similar issue exists or has been closed before.
-  -
-  - If you're asking a question about how to use Blockly in your application,
-  - please ask questions on the mailing list, instead of filing issues:
-  -       https://groups.google.com/forum/#!forum/blockly
-  -->
-
-**Describe the bug**
-
-<!-- A clear and concise description of what the bug is. -->
-
-**To Reproduce**
-
-<!-- Explain what someone needs to do in order to see what's described above -->
-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. -->
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Stack Traces**
-
-<!-- Please open up the console.  If you see any Blockly-related errors,
-  -        paste them between the quotes below.
-  -
-  - Ignore any instances of...
-  - "Uncaught (in promise) DOMException: The play() request was interrupted by a call to pause()."
-  -->
-
-```
-Replace with error stack trace.
-```
-
-**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 000000000..2c8f03d3f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,58 @@
+name: Bug Report
+description: Create a report to help us improve
+labels: 'type: bug, issue: triage'
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Thank you for taking the time to fill out a bug report! 
+        If you have a question about how to use Blockly in your application,
+        please ask on the [forum](https://groups.google.com/forum/#!forum/blockly) instead of filing an issue.
+  - type: checkboxes
+    id: duplicates
+    attributes:
+      label: Check for Duplicates
+      options:
+        - label: I have searched for similar issues before opening a new one.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Please provide a clear and concise description of the bug.
+      placeholder: What happened? What did you expect to happen?
+    validations:
+      required: true
+  - type: textarea
+    id: repro
+    attributes:
+      label: Reproduction Steps
+      description: What steps should we take to reproduce the issue?
+      value: |
+        1. 
+        2. 
+        3. 
+  - type: textarea
+    id: stack-trace
+    attributes:
+      label: Stack Trace
+      description: If you saw an error message or stack trace, please include it here.
+      placeholder: The text in this section will be formatted automatically; no need to include backticks.
+      render: shell
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: Screenshots can help us see the behavior you're describing. Please add a screenshot or gif, especially if you are describing a rendering or visual bug.
+      placeholder: Paste or drag-and-drop an image to upload it.
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: Browsers
+      description: Please select all browsers you've observed this behavior on. If the bug isn't browser-specific, you can leave this blank.
+      multiple: true
+      options:
+        - Chrome desktop
+        - Safari desktop
+        - Firefox desktop
+        - Android mobile
+        - iOS mobile