diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
index dd84ea782..a55969166 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -1,38 +1,74 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report for a problem that shouldn't be happening
 title: ''
-labels: ''
+labels: bug
 assignees: ''
 
 ---
 
-**Describe the bug**
+## Bug Description
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+## How to Reproduce
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+## Expected Behavior
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+## Screenshots
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+## Server Information
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+### PHP Operating System
 
-**Additional context**
+```
+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/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
index bbcbbe7d6..c72f64a81 100644
--- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
@@ -2,19 +2,20 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: ''
+labels: enhancement
 assignees: ''
 
 ---
 
-**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 [...]
+## Motivation
+Why are you making this feature request?
+Please provide a clear and concise description of what the problem is.
 
-**Describe the solution you'd like**
+## Proposed Solution
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+## Alternatives
+A clear and concise description of any alternative solutions or features you've considered and why they are insufficient.
 
-**Additional context**
+## Additional Context
 Add any other context or screenshots about the feature request here.