diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 91%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 2d4f8c8ae01..9c045955bb3 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,30 +1,26 @@
-<!--
-  PLEASE READ THE FIRST SECTION :-)
--->
-
-### Is this a bug report?
-
-(write your answer here)
-
+---
+name: Bug report
+about: Create a report to help us improve
+labels: "issue: bug"
+---
 
 <!--
-  If you answered "Yes":
-
     Please note that your issue will be fixed much faster if you spend about
     half an hour preparing it, including the exact reproduction steps and a demo.
 
     If you're in a hurry or don't feel confident, it's fine to report bugs with
     less details, but this makes it less likely they'll get fixed soon.
 
-    In either case, please fill as many fields below as you can.
-
-  If you answered "No":
+    In either case, please use this template and fill in as many fields below as you can.
 
-    If this is a question or a discussion, you may delete this template and write in a free form.
     Note that we don't provide help for webpack questions after ejecting.
     You can find webpack docs at https://webpack.js.org/.
 -->
 
+### Desribe the bug
+
+(Write your answer here.)
+
 ### Did you try recovering your dependencies?
 
 <!--
@@ -98,10 +94,10 @@
   Paste the output of the command in the section below.
 -->
 
-(paste the output of the command here)
+(paste the output of the command here.)
 
 
-### Steps to Reproduce
+### Steps to reproduce
 
 <!--
   How would you describe your issue to someone who doesn’t know you or your project?
@@ -115,7 +111,7 @@
 3. 
 
 
-### Expected Behavior
+### Expected behavior
 
 <!--
   How did you expect the tool to behave?
@@ -126,7 +122,7 @@
 (Write what you thought would happen.)
 
 
-### Actual Behavior
+### Actual behavior
 
 <!--
   Did something go wrong?
@@ -137,7 +133,7 @@
 (Write what happened. Please add screenshots!)
 
 
-### Reproducible Demo
+### Reproducible demo
 
 <!--
   If you can, please share a project that reproduces the issue.
diff --git a/.github/ISSUE_TEMPLATE/proposal.md b/.github/ISSUE_TEMPLATE/proposal.md
new file mode 100644
index 00000000000..566ccdee510
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/proposal.md
@@ -0,0 +1,39 @@
+---
+name: Proposal
+about: Suggest an idea for improving Create React App
+labels: "issue: proposal"
+---
+
+### Is your proposal related to a problem?
+
+<!--
+  Provide a clear and concise description of what the problem is.
+  For example, "I'm always frustrated when..."
+-->
+
+(Write your answer here.)
+
+### Describe the solution you'd like
+
+<!--
+  Provide a clear and concise description of what you want to happen.
+-->
+
+(Describe your proposed solution here.)
+
+### Describe alternatives you've considered
+
+<!--
+  Let us know about other solutions you've tried or researched.
+-->
+
+(Write your answer here.)
+
+### Additional context
+
+<!--
+  Is there anything else you can add about the proposal? 
+  You might want to link to related issues here, if you haven't already.
+-->
+
+(Write your answer here.)