diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index fb11ee3..00a149b 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,5 @@
 ---
-name: Feature request
+name: Feature request (plugin)
 about: Suggest an idea for this project
 title: ''
 labels: 'enhancement'
diff --git a/.github/ISSUE_TEMPLATE/feature_request_server.md b/.github/ISSUE_TEMPLATE/feature_request_server.md
new file mode 100644
index 0000000..54e7285
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request_server.md
@@ -0,0 +1,21 @@
+---
+name: Feature request (server)
+about: Suggest an idea for this project
+title: ''
+labels: 'enhancement (server)'
+assignees: ''
+
+---
+This template is used to suggest things to be added to the **Command Panels Server**, if you would like to suggest something for the **Command Panels Plugin**, click [here](https://github.com/rockyhawk64/CommandPanels/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=)
+
+### 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.
diff --git a/.github/ISSUE_TEMPLATE/need-help.md b/.github/ISSUE_TEMPLATE/need_help.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/need-help.md
rename to .github/ISSUE_TEMPLATE/need_help.md