diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index a9179dc54..0aaeb0d1e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,5 @@
 name: Bug Report 🐞
-description: Report a new and clearly identified bug that must be fixed directly in the application
+description: Report a new and clearly identified bug that must be fixed directly in the application.
 title: "Category: Short bug description (PLEASE CHANGE)"
 labels:
   - bug
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 55b4db085..f90abff61 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -1,5 +1,5 @@
 name: Feature Request
-description: Suggest a new feature or enhancement
+description: Suggest a new feature or enhancement.
 title: "Category: Short feature description (PLEASE CHANGE)"
 labels:
   - idea
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index e491e7a4f..000000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Question 💬
-about: You have a general question or need assistance
-title: 'PLEASE DO NOT OPEN AN ISSUE FOR YOUR QUESTION, AND USE GITHUB DISCUSSIONS OR OUR COMMUNITY CHAT INSTEAD'
-labels: question
-assignees: ''
-
----
-
-FOR GENERAL QUESTIONS, TECHNICAL SUPPORT, AND TO GET TO KNOW OTHER COMMUNITY MEMBERS:
-
-<https://github.com/photoprism/photoprism/discussions>
-
-OUR TROUBLESHOOTING CHECKLISTS HELP YOU QUICKLY DIAGNOSE AND FIX COMMON PROBLEMS:
-
-<https://docs.photoprism.app/getting-started/troubleshooting/>
-
-PLEASE DO NOT OPEN AN ISSUE FOR YOUR QUESTION, AND USE GITHUB DISCUSSIONS OR OUR COMMUNITY CHAT INSTEAD. THANK YOU VERY MUCH!
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
deleted file mode 100644
index ac0f49657..000000000
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Question 💬
-description: Use Discussions for general questions, community support, and troubleshooting help
-title: "Category: Question details (PLEASE CHANGE)"
-labels:
-  - question
-assignees: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Use Discussions for general questions, community support, and troubleshooting help:
-        https://github.com/photoprism/photoprism/discussions
-  - type: checkboxes
-    id: question-confirmation
-    attributes:
-      label: Please Confirm
-      options:
-        - label: I understand that questions should not be asked through GitHub Issues
-          required: true
-  - type: textarea
-    id: your-question
-    attributes:
-      label: Your Question
-      description: Provide the specific question and the context needed to answer it.
-      placeholder: Summarize your question, the context, and any resources you have already reviewed.
-    validations:
-      required: true