diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index f0bd0b762..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
-  - Thanks for opening an issue for us!  Before you open an issue,
-  - please check if a similar issue exists or has been closed before.
-  -
-  - If you're asking a question about how to use Blockly in your application,
-  - please ask questions on the mailing list, instead of filing issues:
-  -       https://groups.google.com/forum/#!forum/blockly
-  -->
-
-### Problem statement
-
-<!-- TODO: Please describe the problem.
-  -        Is it a bug report (something didn't work the way you expected),
-  -        or a feature request (something new you think would improve Blockly)?
-  -->
-
-### Expected Behavior
-
-<!-- TODO: Please describe what should happen.
-  -        Include screenshots if applicable.
-  -->
-
-### Actual Behavior
-
-<!--  TODO: Describe what actually happens.
-  -         Include screenshots if applicable.
-  -->
-
-### Steps to Reproduce
-
-<!-- TODO: Explain what someone needs to do in order to see
-  -        what's described in *Actual behavior* above
-  -->
-
-1. Start by..
-2. Next, do..
-
-### Stack Traces
-
-<!-- TODO: Please open up the console.  If you see any Blockly-related errors,
-  -        paste them between the quotes below.
-  -
-  - Ignore any instances of...
-  - "Uncaught (in promise) DOMException: The play() request was interrupted by a call to pause()."
-  -->
-
-```
-Replace with error stack trace.
-```
-
-### Operating System and Browser
-
-<!-- TODO: If this issue is browser specific, uncomment the systems you have tested. -->
-
-<!-- * Desktop Chrome -->
-<!-- * Desktop Firefox -->
-<!-- * Desktop Safari -->
-<!-- * Desktop Opera -->
-<!-- * Windows Internet Explorer 10 -->
-<!-- * Windows Internet Explorer 11 -->
-<!-- * Windows Edge -->
-
-<!--
-* Smartphone/Tablet/Chromebook (please complete the following information):
-  * Device: [e.g. iPhone6]
-  * OS: [e.g. iOS8.1]
-  * Browser [e.g. stock browser, safari]
-  * Version [e.g. 22]
--->
-
-### Additional Information
-
-<!-- Anything else we should know? -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..9119a0172
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,64 @@
+<!--
+  - Thanks for opening an issue for us!  Before you open an issue,
+  - please check if a similar issue exists or has been closed before.
+  -
+  - If you're asking a question about how to use Blockly in your application,
+  - please ask questions on the mailing list, instead of filing issues:
+  -       https://groups.google.com/forum/#!forum/blockly
+  -->
+---
+name: Bug report
+about: Create a report to help us improve
+labels: 'type: bug, triage'
+assignees: ''
+
+---
+
+**Describe the bug**
+
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+
+<!-- Explain what someone needs to do in order to see what's described above -->
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Screenshots**
+
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Stack Traces**
+
+<!-- Please open up the console.  If you see any Blockly-related errors,
+  -        paste them between the quotes below.
+  -
+  - Ignore any instances of...
+  - "Uncaught (in promise) DOMException: The play() request was interrupted by a call to pause()."
+  -->
+
+```
+Replace with error stack trace.
+```
+
+**Additional context**
+
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..5b85b635c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+labels: 'type: feature request, triage'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+
+<!-- Add any other context or screenshots about the feature request here. -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c828f5842..211fff419 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -48,6 +48,12 @@ Tested on:
   * Version [e.g. 22]
 -->
 
+### Documentation
+
+<!-- TODO: Does any documentation need to be created or updated because of this PR?
+  -        If so please explain.
+  -->
+
 ### Additional Information
 
 <!-- Anything else we should know? -->