diff --git a/.github/ISSUE_TEMPLATE/bug-report-feature-request.md b/.github/ISSUE_TEMPLATE/bug-report-feature-request.md
deleted file mode 100644
index 938718130..000000000
--- a/.github/ISSUE_TEMPLATE/bug-report-feature-request.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: Bug report or feature request
-about: Having problems or have ideas?  We'd love to know what you think and help you out.
----
-
-Thanks for helping by reporting issues and sharing ideas you might have! Please delete this message before submitting your issue, this is just a note to help.
-
-## Feature requests
-
-While no idea is a bad idea, some might make more sense for Owncast than others.
-
-Take a look at the [Owncast product definition](https://github.com/owncast/owncast/blob/develop/docs/product-definition.md) to see what our focus is and how your requests might align.
diff --git a/.github/ISSUE_TEMPLATE/bug-report-feature-request.yml b/.github/ISSUE_TEMPLATE/bug-report-feature-request.yml
new file mode 100644
index 000000000..284516e6c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report-feature-request.yml
@@ -0,0 +1,15 @@
+name: Bug report or feature request
+description: Submit a bug you encountered or share an idea you have for the project.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for helping by reporting issues and sharing ideas you might have!
+        While no idea is a bad idea, some might make more sense for Owncast than others.
+        Take a look at the [Owncast product definition](https://github.com/owncast/owncast/blob/develop/docs/product-definition.md) to see what our focus is and how your requests might align.
+
+  - type: textarea
+    id: issue-body
+    attributes:
+      label: Share your bug report, feature request, or comment.
+      description: Please include as much detail as possible.