diff --git a/.github/ISSUE_TEMPLATE/ask-question.md b/.github/ISSUE_TEMPLATE/ask-question.md
deleted file mode 100644
index 7b5f76d7..00000000
--- a/.github/ISSUE_TEMPLATE/ask-question.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Ask Question
-about: Post a question
-title: ''
-labels: question
-assignees: ''
-
----
-
-
diff --git a/.github/ISSUE_TEMPLATE/ask_question.md b/.github/ISSUE_TEMPLATE/ask_question.md
new file mode 100644
index 00000000..366f3c2f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/ask_question.md
@@ -0,0 +1,11 @@
+---
+name: Ask a question
+about: Post a question about ArmorPaint
+title: ''
+labels: question
+assignees: ''
+---
+
+<!-- Please search existing issues for potential duplicates before filing yours:
+https://github.com/armory3d/armorpaint/issues?q=is%3Aissue
+-->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index cf8528b0..fdcb7f15 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,4 +7,21 @@ assignees: ''
 
 ---
 
-*Please specify your ArmorPaint version and OS.*
+<!-- Please search existing issues for potential duplicates before filing yours:
+https://github.com/armory3d/armorpaint/issues?q=is%3Aissue
+-->
+
+**ArmorPaint version:**
+<!-- Specify commit hash if using non-official build. -->
+
+
+**OS/device including version:**
+<!-- Specify GPU model, drivers, and the backend (non-DXR or DXR) if graphics-related. -->
+
+
+**Issue description:**
+<!-- What happened, and what was expected. -->
+
+
+**Steps to reproduce:**
+<!-- If needed, include screenshots by drag and dropping them. -->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..2b983b40
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,2 @@
+# Disallow blank issues to make sure people follow one of the templates.
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index e431c1b9..59f262ba 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,7 +4,8 @@ about: Create a feature request
 title: ''
 labels: feature request
 assignees: ''
-
 ---
 
-
+<!-- Please search existing issues for potential duplicates before filing yours:
+https://github.com/armory3d/armorpaint/issues?q=is%3Aissue
+-->