diff --git a/.github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md b/.github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md
new file mode 100644
index 000000000..a2e76acef
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md
@@ -0,0 +1,8 @@
+---
+name: "🛒 Marketplace Support"
+about: 'For reporting any issues with the marketplace, send an email to hello@octobercms.com'
+---
+
+All marketplace support issues will be addressed through email support.
+
+Thanks!
diff --git a/.github/ISSUE_TEMPLATE/2_SUPPORT_QUESTION.md b/.github/ISSUE_TEMPLATE/4_GENERAL_SUPPORT.md
similarity index 77%
rename from .github/ISSUE_TEMPLATE/2_SUPPORT_QUESTION.md
rename to .github/ISSUE_TEMPLATE/4_GENERAL_SUPPORT.md
index 3ea7271c1..c3e45978e 100644
--- a/.github/ISSUE_TEMPLATE/2_SUPPORT_QUESTION.md
+++ b/.github/ISSUE_TEMPLATE/4_GENERAL_SUPPORT.md
@@ -1,6 +1,6 @@
 ---
-name: "⚠️ Support Question"
-about: 'This repository is only for reporting bugs or problems. If you need help, see: https://octobercms.com/support'
+name: "⚠️ General Support"
+about: 'This repository is only for reporting bugs or problems. If you need help using OctoberCMS, see: https://octobercms.com/support'
 ---
 
 This repository is only for reporting bugs or problems. If you need support, please use the following options:
diff --git a/.github/ISSUE_TEMPLATE/4_DOCUMENTATION.md b/.github/ISSUE_TEMPLATE/5_DOCUMENTATION.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/4_DOCUMENTATION.md
rename to .github/ISSUE_TEMPLATE/5_DOCUMENTATION.md
diff --git a/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md b/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md
deleted file mode 100644
index d5f3e7b25..000000000
--- a/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: "🛒 Marketplace Support"
-about: 'For reporting any marketplace issues, send an email to hello@octobercms.com'
----
-
-All marketplace support issues will be promptly addressed through email support.
-
-Thanks!
diff --git a/.github/ISSUE_TEMPLATE/5_SECURITY_ISSUES.md b/.github/ISSUE_TEMPLATE/6_SECURITY_ISSUES.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/5_SECURITY_ISSUES.md
rename to .github/ISSUE_TEMPLATE/6_SECURITY_ISSUES.md