diff --git a/.github/ISSUE_TEMPLATE/01_bug-report.md b/.github/ISSUE_TEMPLATE/01_bug-report.md
index ddef746a24..bd2ec63658 100644
--- a/.github/ISSUE_TEMPLATE/01_bug-report.md
+++ b/.github/ISSUE_TEMPLATE/01_bug-report.md
@@ -2,7 +2,7 @@
 name: Bug Report
 about: Create a report to help us improve
 title: ''
-labels: bug?
+labels: ⚠️bug?
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md b/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md
index 6743535a6d..0a4accccec 100644
--- a/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md
@@ -2,7 +2,7 @@
 name: Bug Report (Client specific)
 about: Create a report to help us improve
 title: ''
-labels: bug?, client-side
+labels: ⚠️bug?, 🖥️Client
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md b/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md
index ba825d9b5f..75d1ce22db 100644
--- a/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md
@@ -2,7 +2,7 @@
 name: Bug Report (Server specific)
 about: Create a report to help us improve
 title: ''
-labels: bug?, server-side
+labels: ⚠️bug?, ⚙️Server
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/11_feature-request.md b/.github/ISSUE_TEMPLATE/11_feature-request.md
index 3c7e26232e..ad4d114d44 100644
--- a/.github/ISSUE_TEMPLATE/11_feature-request.md
+++ b/.github/ISSUE_TEMPLATE/11_feature-request.md
@@ -2,7 +2,7 @@
 name: Feature Request
 about: Suggest an idea for this project
 title: ''
-labels: feature
+labels: ✨Feature
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md b/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md
index 27a480bf66..e75787853b 100644
--- a/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md
@@ -2,7 +2,7 @@
 name: Feature Request (Client specific)
 about: Suggest an idea for this project
 title: ''
-labels: client-side, feature
+labels: ✨Feature, 🖥️Client
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md b/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md
index ee7ddfaf36..a55c610436 100644
--- a/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md
@@ -2,7 +2,7 @@
 name: Feature Request (Server specific)
 about: Suggest an idea for this project
 title: ''
-labels: feature, server-side
+labels: ✨Feature, ⚙️Server
 assignees: ''
 
 ---