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/3_GENERAL_SUPPORT.md
similarity index 59%
rename from .github/ISSUE_TEMPLATE/2_SUPPORT_QUESTION.md
rename to .github/ISSUE_TEMPLATE/3_GENERAL_SUPPORT.md
index 3ea7271c1..a76dd57b1 100644
--- a/.github/ISSUE_TEMPLATE/2_SUPPORT_QUESTION.md
+++ b/.github/ISSUE_TEMPLATE/3_GENERAL_SUPPORT.md
@@ -1,12 +1,12 @@
 ---
-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:
 
 - Forum: https://octobercms.com/forum
-- Slack: https://octobercms.slack.com (Invite link: https://octobercms-slack.herokuapp.com/)
+- Slack: https://octobercms.slack.com (Get an invite: https://octobercms-slack.herokuapp.com/)
 - Stack Overflow: https://stackoverflow.com/questions/tagged/octobercms
 
 Thanks!
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/3_FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/4_FEATURE_REQUEST.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/3_FEATURE_REQUEST.md
rename to .github/ISSUE_TEMPLATE/4_FEATURE_REQUEST.md
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/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