diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ddd5c4f2f6..15b874bd2f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,59 +1,59 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
+title: 'bug: '
 labels: bug
 assignees: ''
 
 ---
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+<!-- A clear and concise description of what the bug is. -->
 
 **To Reproduce**
-Steps to reproduce the behavior:
+<!-- 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.
+<!-- A clear and concise description of what you expected to happen. -->
 
 **Screenshots**
-If applicable, add screenshots to help explain your problem.
+<!-- If applicable, add screenshots to help explain your problem. -->
 
 ---
 
-(Delete the irrelevant sections)
+<!-- Delete the irrelevant sections -->
 
-**Keyman Desktop, Keyman for macOS, Keyman for Linux:**
- - OS: [e.g. Windows 7, Windows 10 1803, macOS Mojave, Ubuntu 18.04]
- - Keyman version: [e.g. 10.0.1206.0]
- - Target Application: [e.g. Firefox 55]
-  
-**iPhone/iPad/Android:**
- - Device: [e.g. iPhone 6]
- - OS: [e.g. iOS 8.1]
- - Keyman version [e.g. 10.0.111]
- - Target application: [e.g. Notes, Keyman]
+**Keyman for Windows/macOS/Linux:**
+ - OS: <!-- e.g. Windows 7 x64, Windows 10 2004 x64, macOS Big Sur, Ubuntu 20.04 -->
+ - Keyman version: <!-- e.g. 14.0.192-alpha -->
+ - Target Application: <!-- e.g. Firefox 55 -->
+
+**Keyman for iPhone/iPad/Android:**
+ - Device: <!-- e.g. iPhone 6 -->
+ - OS: <!-- e.g. iOS 8.1 -->
+ - Keyman version <!-- e.g. 14.0.192-alpha -->
+ - Target application: <!-- e.g. Notes, Keyman -->
 
 **KeymanWeb:**
- - OS: [e.g. Windows 7, Windows 10 1803, macOS Mojave, Ubuntu 18.04, Android 8.1]
- - Browser: [e.g. Chrome, Firefox]
- - KeymanWeb Version: [e.g. 10.0.201]
- - URL: [e.g. https://example.com/web_keyboard/]
- 
+ - OS: <!-- e.g. Windows 7, Windows 10 2004 x64, macOS Big Sur, Ubuntu 20.04, Android 10 -->
+ - Browser: <!-- e.g. Chrome, Firefox -->
+ - KeymanWeb Version: <!-- e.g. 10.0.201 -->
+ - URL: <!-- e.g. https://example.com/web_keyboard/ -->
+
 **Keyman Developer:**
- - OS: [e.g. Windows 7, Windows 10 1803]
- - Keyman Developer version: [e.g. 10.0.1206.0]
- 
+ - OS: <!-- e.g. Windows 7, Windows 10 2004 x64 -->
+ - Keyman Developer version: <!-- e.g. 14.0.192-alpha -->
+
 ---
- 
+
 **Keyboard**
- - Keyboard name: [e.g. khmer_angkor]
- - Keyboard version: [e.g. 1.0.1]
- - Language name: [e.g. Khmer]
+ - Keyboard name: <!-- e.g. khmer_angkor -->
+ - Keyboard version: <!-- e.g. 1.0.1 -->
+ - Language name: <!-- e.g. Khmer -->
 
 **Additional context**
-Add any other context about the problem here.
+<!-- 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 8b58dec5cc..fe419375de 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,23 +1,52 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ''
-labels: enhancement
+title: 'feat: '
+labels: feat
 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 [...]
+<!-- A clear and concise description of what the problem is. e.g. I'm always frustrated when [...] -->
 
 **Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+<!-- 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.
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
-**Product context**
- - OS: [e.g. Windows 7, Windows 10 1803, macOS Mojave, Ubuntu 18.04, Android 8.1]
+---
+
+<!-- Delete the irrelevant sections -->
+
+**Keyman for Windows/macOS/Linux:**
+ - OS: <!-- e.g. Windows 7 x64, Windows 10 2004 x64, macOS Big Sur, Ubuntu 20.04 -->
+ - Keyman version: <!-- e.g. 14.0.192-alpha -->
+ - Target Application: <!-- e.g. Firefox 55 -->
+
+**Keyman for iPhone/iPad/Android:**
+ - Device: <!-- e.g. iPhone 6 -->
+ - OS: <!-- e.g. iOS 8.1 -->
+ - Keyman version <!-- e.g. 14.0.192-alpha -->
+ - Target application: <!-- e.g. Notes, Keyman -->
+
+**KeymanWeb:**
+ - OS: <!-- e.g. Windows 7, Windows 10 2004 x64, macOS Big Sur, Ubuntu 20.04, Android 10 -->
+ - Browser: <!-- e.g. Chrome, Firefox -->
+ - KeymanWeb Version: <!-- e.g. 10.0.201 -->
+ - URL: <!-- e.g. https://example.com/web_keyboard/ -->
+
+**Keyman Developer:**
+ - OS: <!-- e.g. Windows 7, Windows 10 2004 x64 -->
+ - Keyman Developer version: <!-- e.g. 14.0.192-alpha -->
+
+---
+
+**Keyboard**
+ - Keyboard name: <!-- e.g. khmer_angkor -->
+ - Keyboard version: <!-- e.g. 1.0.1 -->
+ - Language name: <!-- e.g. Khmer -->
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here. -->