diff --git a/.github/ISSUE_TEMPLATE/0-general.md b/.github/ISSUE_TEMPLATE/0-community.md
similarity index 77%
rename from .github/ISSUE_TEMPLATE/0-general.md
rename to .github/ISSUE_TEMPLATE/0-community.md
index a16087d674..3b0c424255 100644
--- a/.github/ISSUE_TEMPLATE/0-general.md
+++ b/.github/ISSUE_TEMPLATE/0-community.md
@@ -1,13 +1,15 @@
 ---
-name: General Issue
+name: Community Issue
 about: Create a report describing a problem and a proposed solution
 title: ''
-assignees: ''
+labels: ["community"]
+assignees:
+  - @solana-labs/community-issue-subscribers
 ---
 
 #### Problem
 <!--
-  The GitHub issue tracker exists to track issues 
+  The GitHub issue tracker exists to track issues
   that affect the development of Solana itself.
 
   If you need technical support using Solana, building
diff --git a/.github/ISSUE_TEMPLATE/1-core-contributor.md b/.github/ISSUE_TEMPLATE/1-core-contributor.md
new file mode 100644
index 0000000000..077b200baa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-core-contributor.md
@@ -0,0 +1,15 @@
+---
+name: Core Contributor Issue
+about: Create a report describing a problem and a proposed solution
+title: ''
+assignees: ''
+---
+
+#### Problem
+<!--
+  This template should only be used by core contributors. If you
+  are not a core contributor, please use the "Community Issue" template
+  to ensure that your issue can be triaged appropriately.
+-->
+
+#### Proposed Solution
diff --git a/.github/ISSUE_TEMPLATE/1-feature-gate.yml b/.github/ISSUE_TEMPLATE/2-feature-gate.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/1-feature-gate.yml
rename to .github/ISSUE_TEMPLATE/2-feature-gate.yml