diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index fbc97172e..14a893d60 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -14,9 +14,10 @@ A clear and concise description of what the bug is.
 Describe firmware version or revision you are using when encountering the bug.
 
 **Desktop/smartphone setup (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+ - Wallet software: [e.g. Trezor Wallet, Trezor Beta Wallet, Trezor Suite, Electrum]
+ - OS: [e.g. Windows, macOS, Linux, Android]
+ - Browser [e.g. chrome, firefox, safari]
+ - Version [e.g. 42]
 
 **To Reproduce**
 Steps to reproduce the behavior:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index eed4aff64..28b070dc4 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: feature, enhancement
+labels: enhancement, feature
 assignees: ''
 
 ---