diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index 069ca6540..000000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-name: "🐛 Bug Report"
-about: "If something isn't working as expected"
-
----
-## Bug Report
-
-**Current Behavior**
-A clear and concise description of the behavior.
-
-**Steps to Reproduce**
-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.
-
-**Environment**
-- Flarum version: x.y.z
-- Website URL: http://example.com
-- Webserver: [e.g. apache, nginx]
-- Hosting environment: [e.g. shared, vps]
-- PHP version: x.y.z
-- Browser: [e.g. chrome 67, safari 11]
-
-```
-Output of "php flarum info", run this in terminal in your Flarum directory.
-```
-
-**Possible Solution**
-<!--- Only if you have suggestions or a fix for the bug -->
-
-**Additional Context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 000000000..654925bd5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,78 @@
+name: "🐛 Bug Report"
+description: If something isn't working as expected
+labels: ["type/bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: current_behavior
+    attributes:
+      label: Current Behavior
+      description: A clear and concise description of the behavior.
+    validations:
+      required: true
+  - type: textarea
+    id: steps_to_reproduce
+    attributes:
+      label: Steps to Reproduce
+      description: The exact steps to reproduce the bug.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error message '....'
+    validations:
+      required: true
+  - type: textarea
+    id: expected_behavior
+    attributes:
+      label: Expected Behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      decscription: If applicable, add screenshots to help explain your problem.
+    validations:
+      required: false
+  - type: textarea
+    id: enironment
+    attributes:
+      label: Environment
+      value: |
+        - Flarum version: x.y.z
+        - Website URL: http://example.com
+        - Webserver: [e.g. apache, nginx]
+        - Hosting environment: [e.g. shared, vps]
+        - PHP version: x.y.z
+        - Browser: [e.g. chrome 67, safari 11]
+    validation:
+      required: true
+  - type: textarea
+    id: php_flarum_info
+    attributes:
+      label: "Output of `php flarum info`"
+      value: |
+        ```
+        Output of "php flarum info", run this in terminal in your Flarum directory.
+        ```
+    validation:
+      required: false
+  - type: textarea
+    id: possible_solution
+    attributes:
+      label: Possible Solution
+      description: Only if you have suggestions or a fix for the bug.
+    validation:
+      required: false
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: Additional Context
+      description: Add any other context about the problem here.
+    validation:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
deleted file mode 100644
index 8d7ce98cf..000000000
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: "🚀 Feature Request"
-about: "If you have a suggestion please head over to our forum!"
-
----
-
-We primarily use GitHub as a bug tracker and issue tracker for items we are sure to tackle in the near future. For feature requests, ideas and feedback please post in the Flarum Community: https://discuss.flarum.org/t/proposals. Feature requests are added to GitHub only when they have been accepted by the development team and implementation details have been laid out.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 000000000..006e8c593
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,10 @@
+name: "🚀 Feature Request"
+description: If you have a suggestion/proposal to improve Flarum.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+        We primarily use GitHub as a bug tracker and issue tracker for items we are sure to tackle in the near future.
+        For feature requests, ideas and feedback please post in the Flarum Community: https://discuss.flarum.org/t/proposals.
+        Feature requests are added to GitHub only when they have been accepted by the development team and implementation details have been laid out.
diff --git a/.github/ISSUE_TEMPLATE/support-question.md b/.github/ISSUE_TEMPLATE/support-question.md
deleted file mode 100644
index 81a584770..000000000
--- a/.github/ISSUE_TEMPLATE/support-question.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: "🙋‍ Support Question"
-about: "If you have a question, please check out our forum or Discord!"
-
----
-
-We primarily use GitHub as a bug tracker and issue tracker for items we are sure to tackle in the near future; for usage and support questions, please check out these resources below. Thanks!
-
-* Flarum Community: https://discuss.flarum.org/
-* Discord Chat: https://flarum.org/discord/
-* Twitter: https://twitter.com/Flarum
diff --git a/.github/ISSUE_TEMPLATE/support-question.yml b/.github/ISSUE_TEMPLATE/support-question.yml
new file mode 100644
index 000000000..8a62a567b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/support-question.yml
@@ -0,0 +1,11 @@
+name: "🙋‍ Support Question"
+description: If you have a question, please check out our forum or Discord!
+body:
+  - type: markdown
+    attributes:
+      value: |
+        We primarily use GitHub as a bug tracker and issue tracker for items we are sure to tackle in the near future; for usage and support questions, please check out these resources below. Thanks!
+
+        * Flarum Community: https://discuss.flarum.org/
+        * Discord Chat: https://flarum.org/discord/
+        * Twitter: https://twitter.com/Flarum