diff --git a/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md b/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md
deleted file mode 100644
index 513598011c..0000000000
--- a/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: 🐛 Bug Report (🖥️Client specific)
-about: Create a report to help us improve
-title: ''
-labels: ⚠️bug?, 🖥️Client
-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/11_feature-request.md b/.github/ISSUE_TEMPLATE/02_feature-request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/11_feature-request.md
rename to .github/ISSUE_TEMPLATE/02_feature-request.md
diff --git a/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md b/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md
deleted file mode 100644
index 41a70d426f..0000000000
--- a/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: 🐛 Bug Report (⚙️Server specific)
-about: Create a report to help us improve
-title: ''
-labels: ⚠️bug?, ⚙️Server
-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/12_client-side-feature-request.md b/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md
deleted file mode 100644
index e3628fb07d..0000000000
--- a/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: ✨ Feature Request (🖥️Client specific)
-about: Suggest an idea for this project
-title: ''
-labels: ✨Feature, 🖥️Client
-assignees: ''
-
----
-
-## Summary
-
-<!-- Tell us what the suggestion is -->
diff --git a/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md b/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md
deleted file mode 100644
index 84f561d44c..0000000000
--- a/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: ✨ Feature Request (⚙️Server specific)
-about: Suggest an idea for this project
-title: ''
-labels: ✨Feature, ⚙️Server
-assignees: ''
-
----
-
-## Summary
-
-<!-- Tell us what the suggestion is -->