diff --git a/.github/ISSUE_TEMPLATES/1_BUG_REPORT.md b/.github/ISSUE_TEMPLATE/1_BUG_REPORT.md
similarity index 82%
rename from .github/ISSUE_TEMPLATES/1_BUG_REPORT.md
rename to .github/ISSUE_TEMPLATE/1_BUG_REPORT.md
index 237547103..c132e14de 100644
--- a/.github/ISSUE_TEMPLATES/1_BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/1_BUG_REPORT.md
@@ -1,7 +1,7 @@
 ---
 name: "🐛 Bug Report"
-about: Report a general OctoberCMS issue
-labels: 'Status: Review Needed', 'Type: Unconfirmed Bug'
+about: 'Report a general OctoberCMS issue'
+labels: 'Status: Review Needed, Type: Unconfirmed Bug'
 ---
 
 - OctoberCMS Build: ### <!-- Or Commit hash if using composer -->
diff --git a/.github/ISSUE_TEMPLATES/2_SUPPORT_QUESTION.md b/.github/ISSUE_TEMPLATE/2_SUPPORT_QUESTION.md
similarity index 100%
rename from .github/ISSUE_TEMPLATES/2_SUPPORT_QUESTION.md
rename to .github/ISSUE_TEMPLATE/2_SUPPORT_QUESTION.md
diff --git a/.github/ISSUE_TEMPLATES/3_FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/3_FEATURE_REQUEST.md
similarity index 100%
rename from .github/ISSUE_TEMPLATES/3_FEATURE_REQUEST.md
rename to .github/ISSUE_TEMPLATE/3_FEATURE_REQUEST.md
diff --git a/.github/ISSUE_TEMPLATES/4_DOCUMENTATION.md b/.github/ISSUE_TEMPLATE/4_DOCUMENTATION.md
similarity index 100%
rename from .github/ISSUE_TEMPLATES/4_DOCUMENTATION.md
rename to .github/ISSUE_TEMPLATE/4_DOCUMENTATION.md
diff --git a/.github/ISSUE_TEMPLATES/5_SECURITY_ISSUES.md b/.github/ISSUE_TEMPLATE/5_SECURITY_ISSUES.md
similarity index 100%
rename from .github/ISSUE_TEMPLATES/5_SECURITY_ISSUES.md
rename to .github/ISSUE_TEMPLATE/5_SECURITY_ISSUES.md