diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e805197bc..056a71a84 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,8 +9,14 @@ assignees: ''
 
 **What does not work as expected?**
 
+ONLY CREATE A NEW ISSUE AFTER YOU HAVE VERIFIED THAT NO SIMILAR OR RELATED ISSUE ALREADY EXISTS:
+https://github.com/photoprism/photoprism/issues
+
 Never use GitHub Issues if you are unsure, have a general question, or need assistance. Thank you! 💐
 
+You are welcome to use GitHub Discussions instead:
+https://github.com/photoprism/photoprism/discussions
+
 Our troubleshooting checklists help you quickly find and fix common problems:
 https://docs.photoprism.app/getting-started/troubleshooting/
 
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 1b48d1c39..797dac8df 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-ONLY CREATE AN ISSUE AFTER YOU HAVE VERIFIED THAT NO SIMILAR IDEA EXISTS:
+ONLY CREATE A NEW FEATURE REQUEST AFTER YOU HAVE VERIFIED THAT NO SIMILAR IDEA ALREADY EXISTS:
 
 - Roadmap: https://github.com/photoprism/photoprism/projects/5
 - Open Issues: https://github.com/photoprism/photoprism/issues