diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 1fb6d5f863..35f8dfe869 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,25 +1,34 @@
-Per Mattermost guidelines, GitHub issues are for bug reports: <https://handbook.mattermost.com/contributors/contributors/ways-to-contribute/>.
+Before filing a bug report, please check the following:
 
-For troubleshooting see: https://forum.mattermost.com/.
-For feature proposals see: https://mattermost.com/suggestions/
-
-If you've found a bug--something appears unintentional--please follow these steps:
-
-1. Confirm you’re filing a new issue. [Search existing tickets in Jira](https://mattermost.atlassian.net/jira/software/c/projects/MM/issues/) to ensure that the ticket does not already exist.
-2. Confirm your issue does not involve security. Otherwise, please see our [Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
-3. [File a new issue](https://github.com/mattermost/mattermost/issues/new) using the format below. Mattermost will confirm steps to reproduce and file in Jira, or ask for more details if there is trouble reproducing it. If there's already an existing bug in Jira, it will be linked back to the GitHub issue so you can track when it gets fixed. 
+1. Confirm you’re filing a new issue. [Search existing tickets in Jira](https://mattermost.atlassian.net/jira/software/c/projects/MM/issues/) and [existing issues in GitHub](https://github.com/mattermost/mattermost/issues) to ensure that the ticket does not already exist.
+2. Confirm your issue does not involve security. Please submit security issues via our [Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
+3. Confirm your issue is not a feature request. Please submit feature requests on [UserVoice](https://mattermost.uservoice.com/forums/306457-general).
+4. Confirm your issue is not a troubleshooting question. Please submit troubleshooting questions on the [forum](https://forum.mattermost.com/).
+5. File a bug report using the format below. Mattermost will confirm steps to reproduce and file in Jira, or ask for more details if there is trouble reproducing it. If there's already an existing bug in Jira, it will be linked back to the GitHub issue so you can track when it gets fixed.
 
 #### Summary
-Bug report in one concise sentence
+Bug report in one concise sentence.
 
 #### Steps to reproduce
-How can we reproduce the issue (what version are you using?)
+What are the steps to reproduce the issue?
+
+#### Operating System
+What Operating System do you use? (examples: Windows 10 x64, macOS Ventura 13.2 Apple Silicon, Ubuntu Linux 22.04 LTS x64)
+
+#### Mattermost Server Version
+Which version of the Mattermost Server did this occur on? (You can find your Mattermost Server version via **Mattermost Menu** > **About Mattermost**)
 
 #### Expected behavior
-Describe your issue in detail
+What is the expected behaviour?
 
-#### Observed behavior (that appears unintentional) 
-What did you see happen? Please include relevant error messages and/or screenshots.
+#### Observed behavior
+What issue did you see happen?
+
+#### Log Output
+Output from the log files if applicable.
+
+#### Additional Information
+Additional helpful information, such as error messages and/or screenshots.
 
 #### Possible fixes
-If you can, link to the line of code that might be responsible for the problem
+If you can, link to the line of code that might be responsible for the problem.