diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index b0ac295c..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,72 +0,0 @@
----
-name: Bug Report
-about: Report an unexpected behavior or failure
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!--
-By filing an Issue, you are expected to comply with the elementary code of conduct: https://elementary.io/code-of-conduct
-
-Please fill out this template with all the information you have. We can't do much without a detailed description of what you've encountered. Please do your best!
-
-Please note that this tracker is only for bugs and feature requests. Please try these locations if you have a question or comment:
-
-  https://elementaryos.stackexchange.com/
-  https://www.reddit.com/r/elementaryos/
-
-Please read and follow these tips:
-https://elementary.io/docs/code/reference#be-prepared-to-provide-more-information
-
-Lastly, be sure to preview your issue before saving. Thanks!
--->
-
-## Prerequisites
-- [ ] I have searched open and closed issues for duplicates.
-
-## Describe the bug
-A clear and concise description of what the bug is.
-
-If applicable, add screenshots or screen recordings to help explain your problem.
-
-### To Reproduce
-Steps to reproduce the behavior:
-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 or screen recordings
-<!--If applicable, add screenshots or screen recordings to help explain your problem.-->
-
-### Logs
-<!--
-If applicable, please share logs.
-
-Notice erroneous behavior? Get and share debug logs by following:
-https://elementary.io/docs/code/os-dev#debug-logs
-
-The application crashes? Get and share crash logs by following:
-https://elementary.io/docs/code/os-dev#inspecting-crashes
--->
-
-## Platform Information
-<!--
-Please share a screenshot of the System Settings > About screen.
-If you can't please share:
- - OS: [e.g. elementary OS]
- - OS Version [e.g. Juno]
- - Hardware info
-
-Please check what applies:
--->
-- [ ] I'm using the latest version from git that I've manually compiled
-- [ ] I'm using the latest released stable version
-
-## 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 00000000..f6e7d95f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,81 @@
+name: Issue Report
+description: Report an unexpected behavior or failure (AKA a bug)
+type: "Bug"
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+          * Please read these [Tips](https://docs.elementary.io/contributor-guide/feedback/reporting-issues)
+          * Be sure to search open and closed issues for duplicates
+          * Do not put [things in brackets] in your report title
+
+  - type: textarea
+    attributes:
+      label: What Happened?
+      description: A detailed description of unexpected behavior will help us address your issue more quickly. Do your best!
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to Reproduce
+      description: Explain the exact steps one would take to experience the issue. If applicable, add screenshots or screen recordings.
+      placeholder: |
+          1. Went here 
+          2. Did this 
+          3. Clicked that 
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: Explain how what happened is different from what you wanted to happen.
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: OS Version
+      description: The version of elementary OS you are using, or other operating system
+      options:
+        - 8.x (Circe)
+        - 7.x (Horus)
+        - 6.x (Odin/Jólnir)
+        - Other Linux
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: Session Type
+      options:
+        - Classic Session (X11, This is the default)
+        - Secure Session (Wayland)
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: Software Version
+      description: The version of the software you are using
+      options:
+        - Latest release (I have run all updates)
+        - Compiled from git
+        - Older release (I have not run all updates)
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Log Output
+      description: |
+          * Fails without warning? Get and share debug logs by following: https://docs.elementary.io/contributor-guide/feedback/reporting-issues/debug-logs
+          * Unexpectedly quits or stops? Get and share crash logs by following: https://docs.elementary.io/contributor-guide/feedback/reporting-issues/inspecting-crashes
+      render: shell
+
+  - type: textarea
+    attributes:
+      label: Hardware Info
+      description: Relevant hardware information such as graphics drivers, unconventional setups, etc.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 1527bd18..08c5b050 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -5,3 +5,6 @@ contact_links:
   - name: Report an issue with Notifications Settings
     url: https://github.com/elementary/switchboard-plug-notifications/issues/new/choose/
     about: If your issue is related to System Settings → Notifications
+  - name: Ask a question or get help
+    url: https://elementary.io/support
+    about: Get help with community-provided tech support
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index addd7433..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-name: Feature Request
-about: Suggest a new idea or request a missing feature
-title: ''
-labels: 'Priority: Wishlist, Needs Design'
-assignees: ''
-
----
-
-<!--
-By filing an Issue, you are expected to comply with the elementary code of conduct: https://elementary.io/code-of-conduct
-
-Please note that this tracker is only for bugs and feature requests. Please try these locations if you have a question or comment:
-
-  https://elementaryos.stackexchange.com/
-  https://www.reddit.com/r/elementaryos/
-
-Please read and follow these tips:
-https://elementary.io/docs/code/reference#proposing-design-changes
-
-Lastly, be sure to preview your issue before saving. Thanks!
--->
-
-## Prerequisites
-- [ ] I have searched open and closed issues for duplicates.
-
-## Feature
-**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 [...]-->
-
-<!--If applicable, add screenshots or screen recordings to help explain your problem.-->
-
-**Describe the solution you'd like**
-<!--A clear and concise description of what you want to happen. If possible, visualize.-->
-
-**Existing work**
-<!--Does this feature exist elsewhere? Please share as much info as possible about that approach.-->
-
-**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.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000..2abd26ba
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,32 @@
+name: Feature Request
+description: Suggest a new idea or request a missing feature
+labels: ["Priority: Wishlist", "Needs Design"]
+type: "Feature"
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+          * Please read these [Tips](https://docs.elementary.io/contributor-guide/feedback/creating-feature-requests)
+          * Be sure to search open and closed issues for duplicates
+
+  - type: textarea
+    attributes:
+      label: Problem
+      description: Describe the problem that this new feature or idea is meant to address
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Proposal
+      description: Describe the new feature or idea that you would like to propose and how it solves the problem
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Prior Art (Optional)
+      description: List any supporting examples of how others have implemented this feature
+    validations:
+      required: false