diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e4e5282e56..0ed461256d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,22 +1,30 @@
 ---
 name: Bug Report
 about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
 ---
 
 # Summary
+
 <!-- Tell us what the bug is -->
 
 # Expected Behavior
+
 <!--- Tell us what should happen -->
 
 # Actual Behavior
+
 <!--- Tell us what happens instead of the expected behavior -->
 
 # Steps to Reproduce
+
 1.
 2.
 3.
 
 # Environment
+
 <!-- Tell us where on the platform it happens -->
-<!-- e.g. desktop or mobile version, your browser, your OS -->
diff --git a/.github/ISSUE_TEMPLATE/client-side-bug-report.md b/.github/ISSUE_TEMPLATE/client-side-bug-report.md
new file mode 100644
index 0000000000..a8b111d4de
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/client-side-bug-report.md
@@ -0,0 +1,31 @@
+---
+name: Client-side Bug Report
+about: Create a report to help us improve
+title: ''
+labels: bug, client-side
+assignees: ''
+
+---
+
+# Summary
+
+<!-- Tell us what the bug is -->
+
+# Expected Behavior
+
+<!--- Tell us what should happen -->
+
+# Actual Behavior
+
+<!--- Tell us what happens instead of the expected behavior -->
+
+# Steps to Reproduce
+
+1.
+2.
+3.
+
+# Environment
+
+<!-- Tell us where on the platform it happens -->
+<!-- e.g. desktop or mobile version, your browser, your OS -->
diff --git a/.github/ISSUE_TEMPLATE/client-side-feature-request.md b/.github/ISSUE_TEMPLATE/client-side-feature-request.md
new file mode 100644
index 0000000000..0a0958662e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/client-side-feature-request.md
@@ -0,0 +1,12 @@
+---
+name: Client-side Feature Request
+about: Suggest an idea for this project
+title: ''
+labels: client-side, feature
+assignees: ''
+
+---
+
+# Summary
+
+<!-- Tell us what the suggestion is -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 018e68df97..3c7e26232e 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,11 +1,12 @@
 ---
 name: Feature Request
 about: Suggest an idea for this project
+title: ''
+labels: feature
+assignees: ''
+
 ---
 
 # Summary
-<!-- Tell us what the suggestion is -->
 
-# Environment
-<!-- Tell us where on the platform it related -->
-<!-- e.g. desktop or mobile version, your browser, your OS -->
+<!-- Tell us what the suggestion is -->
diff --git a/.github/ISSUE_TEMPLATE/server-side-bug-report.md b/.github/ISSUE_TEMPLATE/server-side-bug-report.md
new file mode 100644
index 0000000000..6dd9d57cb7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/server-side-bug-report.md
@@ -0,0 +1,31 @@
+---
+name: Server-side Bug Report
+about: Create a report to help us improve
+title: ''
+labels: bug, server-side
+assignees: ''
+
+---
+
+# Summary
+
+<!-- Tell us what the bug is -->
+
+# Expected Behavior
+
+<!--- Tell us what should happen -->
+
+# Actual Behavior
+
+<!--- Tell us what happens instead of the expected behavior -->
+
+# Steps to Reproduce
+
+1.
+2.
+3.
+
+# Environment
+
+<!-- Tell us where on the platform it happens -->
+<!-- e.g. your Node.js version, your OS -->
diff --git a/.github/ISSUE_TEMPLATE/server-side-feature-request.md b/.github/ISSUE_TEMPLATE/server-side-feature-request.md
new file mode 100644
index 0000000000..da6dee2906
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/server-side-feature-request.md
@@ -0,0 +1,12 @@
+---
+name: Server-side Feature Request
+about: Suggest an idea for this project
+title: ''
+labels: feature, server-side
+assignees: ''
+
+---
+
+# Summary
+
+<!-- Tell us what the suggestion is -->