diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 83b6a63fb..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,59 +0,0 @@
-**The following are 'hard suggestions': if you have the information
-available to you, you really should put it in the report. Choose one of
-the following templates from below that best fits the issue you wish to
-report.**
-
-# Performance issue
-___This section should be used for any report regarding performance issues___
-
-###  Timings or Profile link:
-___We ask that all timings/profiles are a link, not a screenshot. Screenshots inhibit our ability to figure out the real
-cause of the issue.___
-
-### Description of issue:
-___If applicable___
-
-### Plugin list:
-
-### bukkit.yml, spigot.yml, paper.yml, server.properties
-___Gist/pastebin/hastebin links___
-### Other helpful links
-___The more information we receive, the quicker and more effective we can be at finding the solution to the
-issue.___
-
-### Paper build number:
-___This can be found by running `/version` on your server. `latest` is not a proper version number; we require the output of `/version` so we can properly track down the issue.___
-
-# Incompatibility (Bug)
-
-### What behaviour is expected:
-___What you expected to see___
-### What behaviour is observed:
-___What you actually saw___
-### Steps/models to reproduce:
-___This may include a build schematic, a video, or detailed instructions to help reconstruct the issue___
-
-### Plugin list:
-___A list of your plugins___
-
-### Paper build number:
-___This can be found by running `/version` on your server. `latest` is not a proper version number; we require the output of `/version` so we can properly track down the issue.___
-
-# Crash, Stacktrace
-
-### Link/paste of stack trace
-
-    You can also simply just use code formatting in markdown!
-___We need all of the stack trace! Do not cut off parts of it.___
-
-### Plugin list:
-___A list of your plugins___
-### Actions to reproduce (if known):
-___This may include a build schematic, a video, or detailed instructions to help reconstruct the issue___
-
-### Paper build number:
-___This can be found by running `/version` on your server. `latest` is not a proper version number; we require the output of `/version` so we can properly track down the issue.___
-
-# Suggestion
-
-___We love suggestions! Suggestions are fairly unstructured, and will be treated as such___
diff --git a/.github/ISSUE_TEMPLATE/behavior-bug---plugin-incompatibility.md b/.github/ISSUE_TEMPLATE/behavior-bug---plugin-incompatibility.md
new file mode 100644
index 000000000..53eb321f1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/behavior-bug---plugin-incompatibility.md
@@ -0,0 +1,22 @@
+---
+name: Behavior Bug / Plugin Incompatibility
+about: Server Bug or Plugin Incompatibility
+
+---
+
+### What behaviour is expected:
+___What you expected to see___
+
+### What behaviour is observed:
+___What you actually saw___
+### Steps/models to reproduce:
+___This may include a build schematic, a video, or detailed instructions to help reconstruct the issue___
+
+### Plugin list:
+___A list of your plugins___
+
+### Paper build number:
+___This can be found by running `/version` on your server. `latest` is not a proper version number; we require the output of `/version` so we can properly track down the issue.___
+
+### Anything else:
+___Anything else you think may help us resolve the problem___
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..066b2d920
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**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/performance-problem.md b/.github/ISSUE_TEMPLATE/performance-problem.md
new file mode 100644
index 000000000..f2829d747
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/performance-problem.md
@@ -0,0 +1,23 @@
+---
+name: Performance problem
+about: Report performance problems or areas of concern
+
+---
+
+###  Timings or Profile link:
+___We ask that all timings/profiles are a link, not a screenshot. Screenshots inhibit our ability to figure out the real cause of the issue.___
+
+### Description of issue:
+___If applicable___
+
+### Plugin list:
+___All plugins running on the server___
+
+### bukkit.yml, spigot.yml, paper.yml, server.properties
+___Gist/pastebin/hastebin links___
+### Other helpful links
+___The more information we receive, the quicker and more effective we can be at finding the solution to the
+issue.___
+
+### Paper build number:
+___This can be found by running `/version` on your server. `latest` is not a proper version number; we require the output of `/version` so we can properly track down the issue.___
diff --git a/.github/ISSUE_TEMPLATE/server-crash---stacktrace.md b/.github/ISSUE_TEMPLATE/server-crash---stacktrace.md
new file mode 100644
index 000000000..5604dfa33
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/server-crash---stacktrace.md
@@ -0,0 +1,19 @@
+---
+name: Server crash / Stacktrace
+about: Report server crashes and/or scary stacktraces
+
+---
+
+### Link/paste of stack trace
+
+    You can also simply just use code formatting in markdown!
+___We need all of the stack trace! Do not cut off parts of it.___
+
+### Plugin list:
+___A list of your plugins___
+
+### Actions to reproduce (if known):
+___This may include a build schematic, a video, or detailed instructions to help reconstruct the issue___
+
+### Paper build number:
+___This can be found by running `/version` on your server. `latest` is not a proper version number; we require the output of `/version` so we can properly track down the issue.___