diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ebb18e94002..2308496a692 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
-packages/ @amyrlam @bugzpodder @gaearon @ianschmitz @iansu @mrmckeb @petetnt @timer
+packages/ @bugzpodder @ianschmitz @iansu @mrmckeb @petetnt
 docusaurus/ @amyrlam @iansu
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ac73b33e7de..ac2eebaa4b9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-labels: 'issue: bug'
+labels: 'issue: bug, needs triage'
 ---
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/proposal.md b/.github/ISSUE_TEMPLATE/proposal.md
index d6f97aa64f7..0318fa73620 100644
--- a/.github/ISSUE_TEMPLATE/proposal.md
+++ b/.github/ISSUE_TEMPLATE/proposal.md
@@ -1,7 +1,7 @@
 ---
 name: Proposal
 about: Suggest an idea for improving Create React App
-labels: 'issue: proposal'
+labels: 'issue: proposal, needs triage'
 ---
 
 ### Is your proposal related to a problem?
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000000..147ea1dc458
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,13 @@
+---
+name: Question
+about: Get help with Create React App
+labels: 'needs triage'
+---
+
+If you have a general question about Create React App or about building an app with Create React App we encourage you to post on our Spectrum community instead of this issue tracker. The maintainers and other community members can provide help and answer your questions there: https://spectrum.chat/create-react-app
+
+If you're looking for general information on using React, the React docs have a list of resources: https://reactjs.org/community/support.html
+
+If you've discovered a bug or would like to propose a change please use one of the other issue templates.
+
+Thanks!
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 45268d0b6fc..e4735ea78d0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,7 @@
+---
+labels: 'needs triage'
+---
+
 <!--
 Thank you for sending the PR!