diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/Bug_report.md
similarity index 78%
rename from ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/Bug_report.md
index 42add43923..1523d3554d 100644
--- a/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -1,3 +1,9 @@
+---
+name: Bug report 🐛
+about: Report errors or unexpected behavior 🤔
+
+---
+
 <!--
 
 BEFORE SUBMITTING A NEW ISSUE, PLEASE READ THE FAQ!!
@@ -6,6 +12,10 @@ https://github.com/PowerShell/vscode-powershell/wiki/FAQ
 If your issue is not addressed by the FAQ, please
 fill in the following details so that we can help you!
 
+IMPORTANT: you can generate a bug report directly from the
+PowerShell extension in Visual Studio Code by selecting
+"PowerShell: Upload Bug Report to GitHub" from the command palette.
+
 The more repro details you can provide, along with a zip
 of the log files from your session, the better the chances
 are for a quick resolution.
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 0000000000..1d11250c90
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,15 @@
+---
+name: Feature request/idea 🚀
+about: Suggest a new feature or improvement (this does not mean you have to implement it)
+
+---
+
+**Summary of the new feature**
+
+A clear and concise description of what the problem is that the new feature would solve.
+Try formulating it in user story style (if applicable):
+'As a user I want X so that Y.' with X being the being the action and Y being the value of the action.
+
+**Proposed technical implementation details (optional)**
+
+A clear and concise description of what you want to happen.
diff --git a/.github/ISSUE_TEMPLATE/Support_request.md b/.github/ISSUE_TEMPLATE/Support_request.md
new file mode 100644
index 0000000000..55a614d848
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Support_request.md
@@ -0,0 +1,8 @@
+---
+name: Support Question ❓
+about: If you have a question, you can try asking in the VSCode channel of the international PowerShell Slack channel first.  You can also try Gitter chat for vscode-powershell.
+
+---
+
+* Slack Community Chat: https://powershell.slack.com (you can sign-up at http://slack.poshcode.org/ for an invite)
+* Gitter Chat: https://gitter.im/PowerShell/vscode-powershell
diff --git a/.github/ISSUE_TEMPLATE/Syntax_Colorization_Report.md b/.github/ISSUE_TEMPLATE/Syntax_Colorization_Report.md
new file mode 100644
index 0000000000..5cdc736868
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Syntax_Colorization_Report.md
@@ -0,0 +1,8 @@
+---
+name: Editor Syntax Colorization bug report ❓
+about: Editor syntax colorization bugs are tracked in a separate GitHub repo.
+
+---
+
+* Please submit editor syntax colorization issues with PowerShell scripts
+  to the [EditorSyntax](https://github.com/powershell/editorSyntax/issues) repo on GitHub.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..c9cde9b503
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+## PR Summary
+
+<!-- summarize your PR between here and the checklist -->
+
+## PR Checklist
+
+Note: Tick the boxes below that apply to this pull request by putting an `x` between the square brackets.
+Please mark anything not applicable to this PR `NA`.
+
+- [ ] PR has a meaningful title
+- [ ] Summarized changes
+- [ ] This PR is ready to merge and is not work in progress
+    - If the PR is work in progress, please add the prefix `WIP:` to the beginning of the title and remove the prefix when the PR is ready
+
+@tylerl0706