diff --git a/.github/ISSUE_TEMPLATE/01_bug-report.md b/.github/ISSUE_TEMPLATE/01_bug-report.md
index 0ed461256d..ddef746a24 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 a8b111d4de..6743535a6d 100644
--- a/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md
@@ -1,8 +1,8 @@
 ---
-name: Client-side Bug Report
+name: Bug Report (Client specific)
 about: Create a report to help us improve
 title: ''
-labels: bug, client-side
+labels: bug?, client-side
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md b/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md
index 6dd9d57cb7..ba825d9b5f 100644
--- a/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md
@@ -1,8 +1,8 @@
 ---
-name: Server-side Bug Report
+name: Bug Report (Server specific)
 about: Create a report to help us improve
 title: ''
-labels: bug, server-side
+labels: bug?, server-side
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md b/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md
index 0a0958662e..27a480bf66 100644
--- a/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md
@@ -1,5 +1,5 @@
 ---
-name: Client-side Feature Request
+name: Feature Request (Client specific)
 about: Suggest an idea for this project
 title: ''
 labels: client-side, feature
diff --git a/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md b/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md
index da6dee2906..ee7ddfaf36 100644
--- a/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md
@@ -1,5 +1,5 @@
 ---
-name: Server-side Feature Request
+name: Feature Request (Server specific)
 about: Suggest an idea for this project
 title: ''
 labels: feature, server-side