diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
deleted file mode 100644
index dfd7c0af2d..0000000000
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-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."
-
----
-
-# Bug report
-
-**Please note we will close your issue without comment if you delete, do not read or 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.**
-
-- [ ] ran `brew update` and can still reproduce the problem?
-- [ ] ran `brew doctor`, fixed all issues and can still reproduce the problem?
-- [ ] ran `brew config` and `brew doctor` and included their output with your issue?
-
-<!-- To help us debug your issue, please complete these sections: -->
-
-## What you were trying to do (and why)
-
-<!-- replace me -->
-
-## What happened (include command output)
-
-<!-- replace me -->
-
-<details>
-  <summary>Command output</summary>
-  <pre>
-
-  <!-- replace this with the command output -->
-
-  </pre>
-</details>
-
-## What you expected to happen
-
-<!-- replace me -->
-
-## Step-by-step reproduction instructions (by running `brew` commands)
-
-<!-- replace me -->
-
-## Output of `brew config` and `brew doctor` commands
-
-<pre>
-<!-- replace me -->
-</pre>
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 0000000000..206196ec34
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,41 @@
+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
+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: checkboxes
+    attributes:
+      label: Contributor Checklist
+      description: Please verify that you've followed these steps
+      choices:
+        - label: I ran `brew update` and can still reproduce the problem?
+          required: true
+        - label: I ran `brew doctor`, fixed all issues and can still reproduce the problem?
+          required: true
+  - type: textarea
+    attributes:
+      label: "`brew config` output"
+      required: true
+  - type: textarea
+    attributes:
+      label: "`brew doctor` output"
+      required: true
+  - type: textarea
+    attributes:
+      label: What were you trying to do (and why)?
+      required: true
+  - type: textarea
+    attributes:
+      label: What happened (include all command output)?
+      required: true
+  - type: textarea
+    attributes:
+      label: What did you expect to happen?
+      required: true
+  - type: textarea
+    attributes:
+      label: Step-by-step reproduction instructions (by running `brew` commands)
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
deleted file mode 100644
index d5cf45ee6a..0000000000
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: New issue for Feature Suggestion
-about: Request our thoughts on your suggestion for a new feature for Homebrew.
-
----
-
-# Feature suggestion
-
-**Please note we will close your issue without comment if you delete, do not read or 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.**
-
-<!-- Please fill these sections with the relevant information: -->
-
-# A detailed description of the proposed feature
-
-<!-- replace me -->
-
-# The motivation for the feature
-
-<!-- replace me -->
-
-# How the feature would be relevant to at least 90% of Homebrew users
-
-<!-- (if it's not: do not open a feature request) -->
-
-# What alternatives to the feature have been considered
-
-<!-- replace me -->
-
-<!-- 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. -->
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 0000000000..2ff1b717c7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,27 @@
+name: New issue for Feature Suggestion
+about: Request our thoughts on your suggestion for a new feature for Homebrew.
+labels: features
+issue_body: false
+inputs:
+  - type: description
+    attributes:
+      value: Please note we will close your issue without comment if 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
+      required: true
+  - type: textarea
+    attributes:
+      label: What is the motivation for the feature?
+      required: true
+  - type: textarea
+    attributes:
+      label: How will the feature be relevant to at least 90% of Homebrew users?
+      required: true
+  - type: textarea
+    attributes:
+      label: What alternatives to the feature have been considered?
+      required: true
+  - 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.