diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 611d8ebae..88a6b814d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve Oh My Zsh
+labels: 'Bug'
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c6b4cef42..3ddd72a15 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,8 @@
 blank_issues_enabled: true
 contact_links:
+  - name: Support
+    url: https://github.com/ohmyzsh/ohmyzsh/discussions
+    about: Ask the community for support
   - name: Get help on Discord
     url: https://discord.gg/ohmyzsh
     about: Have a quick question? Join the Discord server and ask on the appropriate channel.
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
deleted file mode 100644
index 8c4f08044..000000000
--- a/.github/ISSUE_TEMPLATE/support.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Support
-about: Request support for any problem you're having with Oh My Zsh
-labels: 'Support'
-
----
-
-1. Look for similar issues already posted (including closed ones)
-2. Include as much relevant information as possible
-3. Try to make sure the issue is due to Oh My Zsh