diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/-category--bug-report.md
similarity index 92%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/-category--bug-report.md
index dd84ea78..c0588559 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/-category--bug-report.md
@@ -1,9 +1,9 @@
 ---
-name: Bug report
+name: "[Category] Bug report"
 about: Create a report to help us improve
 title: ''
-labels: ''
-assignees: ''
+labels: bug
+assignees: whats2000
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/-category--custom-issue-template.md
similarity index 70%
rename from .github/ISSUE_TEMPLATE/custom.md
rename to .github/ISSUE_TEMPLATE/-category--custom-issue-template.md
index 48d5f81f..931b9461 100644
--- a/.github/ISSUE_TEMPLATE/custom.md
+++ b/.github/ISSUE_TEMPLATE/-category--custom-issue-template.md
@@ -1,5 +1,5 @@
 ---
-name: Custom issue template
+name: "[Category] Custom issue template"
 about: Describe this issue template's purpose here.
 title: ''
 labels: ''
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/-category--feature-request.md
similarity index 91%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/-category--feature-request.md
index bbcbbe7d..eefd380a 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/-category--feature-request.md
@@ -1,8 +1,8 @@
 ---
-name: Feature request
+name: "[Category] Feature request"
 about: Suggest an idea for this project
 title: ''
-labels: ''
+labels: suggestion
 assignees: ''
 
 ---