diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
deleted file mode 100644
index 2c11df9e0..000000000
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-name: Bug report
-about: Create a report for a problem that shouldn't be happening
-title: ''
-labels: 'type: bug'
-assignees: ''
-
----
-
-## Bug Description
-A clear and concise description of what the bug is.
-
-## How 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
-If applicable, add screenshots to help explain your problem.
-
-## Server Information
-
-### PHP Operating System
-
-```
-Replace this code block with the "System" value
-found towards the top of /e107_admin/phpinfo.php
-
-e.g.
-Linux localhost 2.4.21-0.13mdk #1 Fri Mar 14 15:08:06 EST 2003 i686
-```
-
-### PHP Version
-
-```
-Replace this code block with the PHP version shown
-at the top of /e107_admin/phpinfo.php
-
-e.g.
-PHP Version 7.3.13
-```
-
-### PHP Modules
-
-1. Go to /e107_admin/phpinfo.php
-2. Change the page to "view source" mode by one of these methods:
-   - Press [Ctrl]+[u]
-   - Press [Option]+[Command]+[u]
-   - Add `view-source:` at the beginning of the address bar
-3. Copy all the source code
-4. Go to https://sed.js.org/
-5. Paste everything into the "STDIN:" box
-6. In the "Command line (--help):" box, write:
-
-       -rn 's|<h2><a id="module_[^"]+"[^>]+>([^<]+)</a></h2>|\1|p'
-
-7. Copy everything from the "STDOUT | STDERR:" box.
-8. Paste what you copied here, replacing this whole "PHP Modules" section.
-
-### Client Information
-
-1. Go to https://duckduckgo.com/?q=my+user+agent
-2. Towards the top, copy your user agent from the line that begins with "Your user agent".
-3. Replace this section with the clipboard contents.
-
-   Example: `Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:71.0) Gecko/20100101 Firefox/71.0`
-
-## Additional Information
-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..2dfee6f47
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -0,0 +1,60 @@
+name: Bug Report
+description: Create a report for a problem that shouldn't be happening
+title: "[Bug]: "
+labels: ["type: bug"]
+body:
+  - type: dropdown
+    id: e107version
+    attributes:
+      label: What e107 version are you using?
+      multiple: true
+      options:
+        - v2.3.2
+        - Latest Github version (just updated)
+    validations:
+      required: true
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: Bug description
+      description: A clear and concise description of what the bug is.
+      placeholder: Tell us what you see. Feel free to include screenshots!  
+    validations:
+      required: true
+  - type: textarea
+    id: how-to-reproduce
+    attributes:
+      label: How to reproduce
+      description: Steps to reproduce the behavior. 
+      placeholder: "1. Go to '...', 2. Click on '....', 3. Scroll down to '....', 4. See error"
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: What did you expect to happen instead? 
+      placeholder: I expected to ...
+    validations:
+      required: true
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: What browser(s) are you seeing the problem on?
+      multiple: true
+      options:
+        - Firefox
+        - Chrome / Brave
+        - Safari
+        - Microsoft Edge
+        - Other (please specify in bug description)
+    validations:
+      required: true
+  - type: input
+    id: php-version
+    attributes:
+      label: PHP Version
+      description: Which PHP version do you use? Can be found in Admin Area > About > PHP Info (/e107_admin/phpinfo.php)
+      placeholder: eg. PHP 8.1
+    validations:
+      required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
deleted file mode 100644
index 59ec5ad3d..000000000
--- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: 'type: enhancement'
-assignees: ''
-
----
-
-## Motivation
-Why are you making this feature request?
-Please provide a clear and concise description of what the problem is.
-
-## Proposed Solution
-A clear and concise description of what you want to happen.
-
-## Alternatives
-A clear and concise description of any alternative solutions or features you've considered and why they are insufficient.
-
-## 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 000000000..99c40fc5a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
@@ -0,0 +1,36 @@
+name: Feature Request
+description: Suggest an idea for this project
+title: "[Feature request]: "
+labels: ["type: enhancement"]
+body:
+  - type: textarea
+    id: motivation
+    attributes:
+      label: Motivation
+      description: Why are you making this feature request? Which problem is this feature request solving?
+      placeholder: When I ... 
+    validations:
+      required: true
+  - type: textarea
+    id: proposed-solution
+    attributes:
+      label: Proposed Solution
+      description: A clear and concise description of what you want to happen, or of which functionality you would like to see
+      placeholder: I would like ...
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives
+      description: Describe which alternative solutions or features you've considered and why they are insufficient.
+      placeholder: I tried ...
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Add any other context or screenshots about the feature request here.
+      placeholder: 
+ 
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/QUESTION.md b/.github/ISSUE_TEMPLATE/QUESTION.md
deleted file mode 100644
index f03262621..000000000
--- a/.github/ISSUE_TEMPLATE/QUESTION.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: Question
-about: Ask about behavior that you can't find documented anywhere
-title: ''
-labels: 'type: question'
-assignees: ''
-
----
-
-<!-- If you know that something isn't working the way it should, -->
-<!-- please file a bug report instead. -->
-
-<!-- If you know that what you're trying to do is not implemented, -->
-<!-- please make a feature request instead. -->
-
-## Question
-What are you confused or uncertain about?
-What are you trying to accomplish?
-Examples:
- - Why are X and Y presented in different styles?
- - How can I disable feature Z?
- - Where can I add analytics code to all my pages?
-
-## Expected Source
-Where did you look to try to find the answer to your question?
-We need to know this so that we can put the appropriate documentation in an intuitive place.
-
-## Additional Context
-Add any other context or screenshots about the question here.
diff --git a/.github/ISSUE_TEMPLATE/QUESTION.yml b/.github/ISSUE_TEMPLATE/QUESTION.yml
new file mode 100644
index 000000000..9478faad5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/QUESTION.yml
@@ -0,0 +1,33 @@
+name: Question
+description: Ask about behavior that you cannot find documented anywhere
+title: "[Question]: "
+labels: ["type: question"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+         If you know that something isn't working the way it should, please file a bug report instead.
+         If you know that what you're trying to do is not implemented, please make a feature request instead.
+  - type: textarea
+    id: question  
+    attributes:
+      label: Question
+      description: What are you confused or uncertain about? What are you trying to accomplish?
+      placeholder: 
+    validations:
+      required: true
+  - type: textarea
+    id: expected-source
+    attributes:
+      label: Expected Source
+      description: Where did you look to try to find the answer to your question? Your answer helps us improve the documentation. 
+      placeholder: I looked ...
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Add any other context or screenshots about the feature request here.
+      placeholder: 
+ 
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..ec4bb386b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
\ No newline at end of file