diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 721146d42d..8d4100bfe2 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -2,43 +2,37 @@ name: New issue for Reproducible Bug
 about: "If you're sure it's reproducible and not just your machine: submit an issue so we can investigate."
 labels: bug
 issue_body: false
-body:
-  - type: markdown
+inputs:
+  - type: description
     attributes:
       value: Please note we will close your issue without comment if you do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.
   - type: textarea
     attributes:
       label: "`brew config` output"
-    validations:
       required: true
   - type: textarea
     attributes:
       label: "`brew doctor` output"
-    validations:
       required: true
   - type: checkboxes
     attributes:
       description: Please verify that you've followed these steps
-      options:
+      choices:
         - label: The `brew doctor` above contains no "Warning" lines.
           required: true
   - type: textarea
     attributes:
       label: What were you trying to do (and why)?
-    validations:
       required: true
   - type: textarea
     attributes:
       label: What happened (include all command output)?
-    validations:
       required: true
   - type: textarea
     attributes:
       label: What did you expect to happen?
-    validations:
       required: true
   - type: textarea
     attributes:
       label: Step-by-step reproduction instructions (by running `brew` commands)
-    validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index e92e7dfe95..361f7b0ac3 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -2,30 +2,26 @@ name: New issue for Feature Suggestion
 about: Request our thoughts on your suggestion for a new feature for Homebrew.
 labels: features
 issue_body: false
-body:
-  - type: markdown
+inputs:
+  - type: description
     attributes:
       value: Please note we will close your issue without comment if you do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.
   - type: textarea
     attributes:
       label: Provide a detailed description of the proposed feature
-    validations:
       required: true
   - type: textarea
     attributes:
       label: What is the motivation for the feature?
-    validations:
       required: true
   - type: textarea
     attributes:
       label: How will the feature be relevant to at least 90% of Homebrew users?
-    validations:
       required: true
   - type: textarea
     attributes:
       label: What alternatives to the feature have been considered?
-    validations:
       required: true
-  - type: markdown
+  - type: description
     attributes:
       value: We will close this issue or ask you to create a pull-request if it's something the maintainers are not actively planning to work on.