diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 2b83fd702..089b4c10c 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,33 +1,53 @@
-<!--
+<!-- Comment:
 Please do not submit feature requests. The [Community Forums][1] has a
 section for submitting, voting for, and discussing product feature requests.
 [1]: https://community.bitwarden.com
 -->
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+## Describe the Bug
 
-**Steps To Reproduce**
+<!-- Comment:
+A clear and concise description of what the bug is.
+-->
+
+## Steps To Reproduce
+
+<!-- Comment:
 How can we reproduce the behavior:
+-->
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. Click on '...'
 
-**Expected Result**
+## Expected Result
+
+<!-- Comment:
 A clear and concise description of what you expected to happen.
+-->
 
-**Actual Result**
+## Actual Result
+
+<!-- Comment:
 A clear and concise description of what is happening.
+-->
 
-**Screenshots or Videos**
+## Screenshots or Videos
+
+<!-- Comment:
 If applicable, add screenshots and/or a short video to help explain your problem.
+-->
 
-**Mobile**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Build Version (This can be found under "Settings" > "About" [e.g. 2.3.0 (2221)]
- - Is this a Beta release: [Y/N]
+## Environment
 
-**Additional context**
+- Device: [e.g. iPhone6]
+- Operating system: [e.g. iOS 8.1]
+- Build Version (go to "Settings" → "About" in the app): [e.g. 2.3.0 (2221)]
+- Is this a Beta release? [Y/N]
+
+## Additional Context
+
+<!-- Comment:
 Add any other context about the problem here.
+-->