diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 2c8f03d3f..1b3af57bd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,6 +1,6 @@
 name: Bug Report
 description: Create a report to help us improve
-labels: 'type: bug, issue: triage'
+labels: 'issue: bug, issue: triage'
 body:
   - type: markdown
     attributes:
@@ -11,7 +11,7 @@ body:
   - type: checkboxes
     id: duplicates
     attributes:
-      label: Check for Duplicates
+      label: Check for duplicates
       options:
         - label: I have searched for similar issues before opening a new one.
   - type: textarea
@@ -25,7 +25,7 @@ body:
   - type: textarea
     id: repro
     attributes:
-      label: Reproduction Steps
+      label: Reproduction steps
       description: What steps should we take to reproduce the issue?
       value: |
         1. 
@@ -34,7 +34,7 @@ body:
   - type: textarea
     id: stack-trace
     attributes:
-      label: Stack Trace
+      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
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
deleted file mode 100644
index 343defc12..000000000
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-name: Documentation
-about: Report an issue with our documentation
-labels: 'type: documentation, issue: triage'
-assignees: ''
-
----
-
-<!--
-  - Thanks for helping us improve our developer site documentation!
-  - Use this template to describe issues with the content at
-  - developers.google.com/blockly/guides
-  -->
-
-**Where**
-
-<!-- A link to the page with the documentation you want us to update.
-  -  More specific is better.  If no page exists, describe what the page
-  -  should be, and where.
-  -->
-
-**What**
-
-<!-- What kind of content is it?
-  -  Check a box with an 'x' between the brackets: [x]
-  -->
-
-- [ ] Text
-- [ ] Image or Gif
-- [ ] Other
-
-**Old content**
-
-<!-- What the documentation currently says -->
-
-**Suggested content**
-
-<!-- Your suggestion for improved documentation -->
-
-**Additional context**
-
-<!-- Add any other context about the problem here.
-  -  If this is related to a specific pull request, link to it.
-  -->
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/documentation.yaml
new file mode 100644
index 000000000..93d7f5011
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.yaml
@@ -0,0 +1,39 @@
+
+name: Documentation
+description: Report an issue with our documentation
+labels: 'issue: docs, issue: triage'
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Thanks for helping us improve our developer site documentation!
+        Use this template to describe issues with the content on our
+        [developer site](https://developers.google.com/blockly/guides).
+  - type: input
+    id: link
+    attributes:
+      label: Location
+      description: >
+        A link to the page with the documentation you want us to be updated.
+        If no page exists, describe what the page should be, and where.
+  - type: checkboxes
+    id: type
+    attributes:
+      label: Type
+      description: What kind of content is it?
+      options:
+        - label: Text
+        - label: Image or Gif
+        - label: Other
+  - type: textarea
+    id: content
+    attributes:
+      label: Suggested content
+      description: Your suggestion for improved documentation. If it's helpful, also include the old content for comparison.
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem. If this is related to a specific pull request, link to it.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 668e1adb1..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-labels: 'type: feature request, issue: triage'
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-
-<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
-
-**Describe the solution you'd like**
-
-<!-- A clear and concise description of what you want to happen. -->
-
-**Describe alternatives you've considered**
-
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
-
-**Additional context**
-
-<!-- Add any other context or screenshots about the feature request here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 000000000..b5c17620f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,40 @@
+
+name: Feature request
+description: Suggest an idea for this project
+labels: 'issue: feature request, issue: triage'
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Thank you for taking the time to fill out a feature request! 
+        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: problem
+    attributes:
+      label: Problem
+      description: Is your feature request related to a problem? Please describe.
+      placeholder: I'm always frustrated when...
+  - type: textarea
+    id: request
+    attributes:
+      label: Request
+      description: Describe your feature request and how it solves your problem.
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives considered
+      description: Describe any alternative solutions or features you've considered.
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.