diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index cb7c7b5a0..4754ae307 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -2,7 +2,7 @@
 name: 🐛 ​ Bug report
 about: Report an issue or problem with the way LuckPerms is functioning.
 title: ''
-labels: bug
+labels: 'type: issue'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/suggestion.md
similarity index 50%
rename from .github/ISSUE_TEMPLATE/feature-request.md
rename to .github/ISSUE_TEMPLATE/suggestion.md
index a159db836..cae60ae12 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/suggestion.md
@@ -1,16 +1,16 @@
 ---
-name: 💡 ​ Feature request
+name: 💡 ​ Suggestion
 about: Suggest an idea for an improvement or change to LuckPerms.
 title: ''
-labels: enhancement
+labels: 'type: suggestion'
 assignees: ''
 
 ---
 
 ### Description
-<!-- Please provide a short description of the feature request in the space below. -->
+<!-- Please provide a short description of the suggestion in the space below. -->
 
 
 ### Proposed behaviour
-<!-- Please provide a short explanation of how the feature should work / be changed, and how this will affect the project. -->
+<!-- Please provide a short explanation of how the feature should work / be changed, and how this will effect the project. -->