diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/01_bug.md
similarity index 79%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/01_bug.md
index d1b3fee72..776b72b55 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/01_bug.md
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Something does not work as expected.
 title: ''
 labels: bug
 assignees: ''
@@ -14,10 +14,10 @@ A clear and concise description of what the bug is.
 Describe firmware version and revision you are using when encountering the bug.
 
 **Desktop/smartphone setup (please complete the following information):**
- - Wallet software: [e.g. Trezor Wallet, Trezor Beta Wallet, Trezor Suite, Electrum]
+ - Wallet software: [e.g. Trezor Suite, Electrum]
  - OS: [e.g. Windows, macOS, Linux, Android]
- - Browser [e.g. chrome, firefox, safari]
- - Version [e.g. 42]
+ - Browser [e.g. Chrome, Firefox, Safari]
+ - Version [e.g. 90.0.2]
 
 **To Reproduce**
 Steps to reproduce the behavior:
diff --git a/.github/ISSUE_TEMPLATE/02_code.md b/.github/ISSUE_TEMPLATE/02_code.md
new file mode 100644
index 000000000..8d50e5dbd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/02_code.md
@@ -0,0 +1,8 @@
+---
+name: Code improvement
+about: Issues related to refactoring, dependencies, code improvements etc.
+title: ''
+labels: code
+assignees: ''
+
+---
diff --git a/.github/ISSUE_TEMPLATE/03_product.md b/.github/ISSUE_TEMPLATE/03_product.md
new file mode 100644
index 000000000..00bed759b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/03_product.md
@@ -0,0 +1,12 @@
+---
+name: Product feature
+about: New product feature ready for development.
+title: ''
+labels: product
+assignees: ''
+
+---
+
+**Design:** [Figma](TODO)
+
+**Spec:** [Notion](TODO)
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..aa064b500
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,4 @@
+contact_links:
+  - name: General support and product feedback
+    url: https://support.trezor.io
+    about: Please do not use this Github repository for technical support. Contact Trezor support directly or visit our community forum at forum.trezor.io.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 28b070dc4..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement, feature
-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 [...]
-
-**Describe the solution you'd like**
-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.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.