diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 611d8ebae3cadbfb48358ee930073a682fd88400..88a6b814dc35e5e66d1c7e16f1be72d9c4d67292 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 c6b4cef42fd0530cdd28ddc7f14459fd3883a50c..3ddd72a158465de418eef8e9e59da908fb0b9a30 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 8c4f0804441df7ca1f9cfb5c93c96291abe50cfd..0000000000000000000000000000000000000000
--- 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