diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 51d3b8bdf7..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-
-For Windows PowerShell 5.1 issues, suggestions, or feature requests please use the following link instead:
-- Windows PowerShell [UserVoice](https://windowsserver.uservoice.com/forums/301869-powershell)
-
-If it is a bug report:
-- make sure you are able to repro it on the latest released version. 
-You can install the latest version from https://github.com/PowerShell/PowerShell/releases
-- Search the existing issues.
-- Refer to the [FAQ](https://github.com/PowerShell/PowerShell/blob/master/docs/FAQ.md).
-- Refer to the [known issues](https://docs.microsoft.com/powershell/scripting/whats-new/known-issues-ps6?view=powershell-6).
-- Fill out the following repro template:
-
-If it's not a bug, please remove the template and elaborate the issue in your own words.
--->
-
-Steps to reproduce
-------------------
-
-```powershell
-
-```
-
-Expected behavior
------------------
-
-```none
-
-```
-
-Actual behavior
----------------
-
-```none
-
-```
-
-Environment data
-----------------
-
-<!-- provide the output of $PSVersionTable -->
-
-```powershell
-> $PSVersionTable
-
-```
diff --git a/.github/ISSUE_TEMPLATE/Bug_Report.md b/.github/ISSUE_TEMPLATE/Bug_Report.md
new file mode 100644
index 0000000000..d5809e24f8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_Report.md
@@ -0,0 +1,44 @@
+---
+name: Bug report 🐛
+about: Report errors or unexpected behavior 🤔
+
+---
+<!--
+
+For Windows PowerShell 5.1 issues, suggestions, or feature requests please use the following link instead:
+Windows PowerShell [UserVoice](https://windowsserver.uservoice.com/forums/301869-powershell)
+
+This repository is **ONLY** for PowerShell Core 6 issues.
+
+- Make sure you are able to repro it on the [latest released version](https://github.com/PowerShell/PowerShell/releases)
+- Search the existing issues.
+- Refer to the [FAQ](https://github.com/PowerShell/PowerShell/blob/master/docs/FAQ.md).
+- Refer to the [known issues](https://docs.microsoft.com/powershell/scripting/whats-new/known-issues-ps6?view=powershell-6).
+
+-->
+
+# Steps to reproduce
+
+```powershell
+
+```
+
+# Expected behavior
+
+```none
+
+```
+
+# Actual behavior
+
+```none
+
+```
+
+# Environment data
+
+<!-- provide the output of $PSVersionTable -->
+
+```none
+
+```
diff --git a/.github/ISSUE_TEMPLATE/Documentation_Issue.md b/.github/ISSUE_TEMPLATE/Documentation_Issue.md
new file mode 100644
index 0000000000..ca425d00a5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Documentation_Issue.md
@@ -0,0 +1,10 @@
+---
+name: Documentation Issue 📚
+about: File issues regarding documentation within the [PowerShell-Docs](https://github.com/powershell/powershell-docs) repository
+
+---
+
+# Documentation Issue
+
+Please open documentation issues that are not specifically for documentation within the
+PowerShell/PowerShell repository in the [PowerShell Docs](https://github.com/powershell/powershell-docs/issues) repository.
diff --git a/.github/ISSUE_TEMPLATE/Feature_Request.md b/.github/ISSUE_TEMPLATE/Feature_Request.md
new file mode 100644
index 0000000000..cd9e5144f6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_Request.md
@@ -0,0 +1,16 @@
+---
+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/enhancement
+
+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.
+Consider providing an example PowerShell experience with expected result.
diff --git a/.github/ISSUE_TEMPLATE/Support_Question.md b/.github/ISSUE_TEMPLATE/Support_Question.md
new file mode 100644
index 0000000000..cebcec5030
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Support_Question.md
@@ -0,0 +1,16 @@
+---
+name: Support Question ❓
+about: If you have a question, you can try asking in the PowerShell Slack channel first. If you need official support, refer to the [PowerShell Support Lifecycle](http://aka.ms/pslifecycle)
+
+---
+
+# Support Question
+
+## Official support
+
+[PowerShell Support Lifecycle](http://aka.ms/pslifecycle)
+
+## Community Resources
+
+[Slack Community Chat](https://powershell.slack.com) - Interactive chat with other PowerShell enthusiasts
+[PowerShell.org Forum](https://powershell.org/forums/) - Search or post new general PowerShell usage questions
diff --git a/.github/ISSUE_TEMPLATE/Windows_PowerShell.md b/.github/ISSUE_TEMPLATE/Windows_PowerShell.md
new file mode 100644
index 0000000000..f69d94a0a4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Windows_PowerShell.md
@@ -0,0 +1,12 @@
+---
+name: Windows PowerShell
+about: Windows PowerShell issues/suggestions need to be reported to [UserVoice](https://windowsserver.uservoice.com/forums/301869-powershell)
+
+---
+
+# Windows PowerShell
+
+For Windows PowerShell 5.1 issues, suggestions, or feature requests please use the following link instead:
+Windows PowerShell [UserVoice](https://windowsserver.uservoice.com/forums/301869-powershell)
+
+This repository is **ONLY** for PowerShell Core 6 issues.