diff --git a/.github/ISSUE_TEMPLATE/Bug_Report.md b/.github/ISSUE_TEMPLATE/Bug_Report.md
index f8383cabd..5b188e071 100644
--- a/.github/ISSUE_TEMPLATE/Bug_Report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_Report.md
@@ -11,7 +11,7 @@ assignees: ''
 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.
+This repository is **ONLY** for PowerShell Core 6 and PowerShell 7+ issues.
 
 - Make sure you are able to repro it on the [latest released version](https://github.com/PowerShell/PowerShell/releases)
 - Search the existing issues.
diff --git a/.github/ISSUE_TEMPLATE/Documentation_Issue.md b/.github/ISSUE_TEMPLATE/Documentation_Issue.md
deleted file mode 100644
index 97f60417b..000000000
--- a/.github/ISSUE_TEMPLATE/Documentation_Issue.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Documentation Issue 📚
-about: File issues regarding documentation within the [PowerShell-Docs](https://github.com/MicrosoftDocs/PowerShell-Docs) repository
-title: "Documentation Issue"
-labels: Issue-Question,Area-Documentation
-assignees: ''
-
----
-
-# Documentation Issue
-
-Please open documentation issues that are not specifically for documentation within the
-PowerShell/PowerShell repository in the [PowerShell Docs](https://github.com/MicrosoftDocs/PowerShell-Docs/issues) repository.
diff --git a/.github/ISSUE_TEMPLATE/Support_Question.md b/.github/ISSUE_TEMPLATE/Support_Question.md
deleted file mode 100644
index 434fb3a75..000000000
--- a/.github/ISSUE_TEMPLATE/Support_Question.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-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](https://aka.ms/pslifecycle)
-title: "Support Question"
-labels: Issue-Question
-assignees: ''
-
----
-
-# Support Question
-
-## Official support
-
-[PowerShell Support Lifecycle](https://aka.ms/pslifecycle)
-
-## Community Resources
-
-[Slack][powershell-slack] and [Discord][powershell-discord] Community Chat - Interactive chat with other PowerShell enthusiasts. Both Slack and Discord are bridged via a bot and can seamlessly talk to each other.
-
-[StackOverflow.com](https://stackoverflow.com/questions/tagged/powershell) and [PowerShell.org Forum](https://powershell.org/forums/) - Search or post new general PowerShell usage questions
-
-[powershell-slack]: https://join.slack.com/t/powershell/shared_invite/enQtMzA3MDcxNTM5MTkxLTBmMWIyNzhkYzVjNGRiOTgxZmFlN2E0ZmVmOWU5NDczNTY2NDFhZjFlZTM1MTZiMWIzZDcwMGYzNjQ3YTRkNWM
-[powershell-discord]: https://discordapp.com/invite/AtzXnJM
diff --git a/.github/ISSUE_TEMPLATE/Windows_PowerShell.md b/.github/ISSUE_TEMPLATE/Windows_PowerShell.md
deleted file mode 100644
index db40e19e5..000000000
--- a/.github/ISSUE_TEMPLATE/Windows_PowerShell.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Windows PowerShell
-about: Windows PowerShell issues/suggestions need to be reported to [UserVoice](https://windowsserver.uservoice.com/forums/301869-powershell)
-labels: Issue-Question
-assignees: ''
-
----
-
-# 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.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..4e050986f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Windows PowerShell
+    url: https://windowsserver.uservoice.com/forums/301869-powershell
+    about: Windows PowerShell issues or suggestions.
+  - name: Support
+    url: https://github.com/PowerShell/PowerShell/blob/master/.github/SUPPORT.md
+    about: PowerShell Support Questions/Help
+  - name: Documentation Issue
+    url: https://github.com/MicrosoftDocs/PowerShell-Docs
+    about: Please open issues on documentation for PowerShell here.