diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index f6ea76ef5..9dc608bb9 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,17 +1,26 @@
-**DO NOT OPEN ISSUES/REQUESTS RELATING TO EXTENSIONS/CATALOGUES IN THIS REPOSITORY. Open them at the following repository  https://github.com/inorichi/tachiyomi-extensions/**
+**PLEASE READ THIS**
 
-**For all other requests Please fill out the form below and remove the first 3 lines of this template**
+I acknowledge that:
 
-**App version:**
+- I have updated to the latest version of the app (stable is v0.8.5)
+- I have updated all extensions
+- If this is an issue with an extension, that I should be opening an issue in https://github.com/inorichi/tachiyomi-extensions
 
-**Android version:**
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
 
-**Issue/Request:**
+---
 
-**Steps to reproduce (if applicable)**
+### Device information
+* Tachiyomi version: ?
+* Android version: ?
+* Device: ?
 
- 1.
- 2.
- 3.
+## Steps to reproduce
+1. First step
+2. Second step
 
-**Other details:**
+## Issue/Request
+?
+
+## Other details
+Additional details and attachments.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ac0f44ea8..76ac4a197 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -3,12 +3,24 @@ name: "🐞 Bug report"
 about: Report a bug
 title: "[Bug] Write short description here"
 labels: "bug"
+---
+
+**PLEASE READ THIS**
+
+I acknowledge that:
+
+- I have updated to the latest version of the app (stable is v0.8.5)
+- I have updated all extensions
+- If this is an issue with an extension, that I should be opening an issue in https://github.com/inorichi/tachiyomi-extensions
+
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
 
 ---
 
 ### Device information
 * Tachiyomi version: ?
 * Android version: ?
+* Device: ?
 
 ## Steps to reproduce
 1. First step
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index d3c307acf..60b3bc43f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -3,8 +3,20 @@ name: "🌟 Feature request"
 about: Suggest a feature to improve Tachiyomi
 title: "[Feature Request] Write short description here"
 labels: "feature"
+---
+
+**PLEASE READ THIS**
+
+I acknowledge that:
+
+- I have updated to the latest version of the app (stable is v0.8.5)
+- I have updated all extensions
+- If this is an issue with an extension, that I should be opening an issue in https://github.com/inorichi/tachiyomi-extensions
+
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
 
 ---
+
 ### Why/User Benefit/User Problem
 (explain why this feature should be added)
 
diff --git a/.github/ISSUE_TEMPLATE/source_issue.md b/.github/ISSUE_TEMPLATE/source_issue.md
new file mode 100644
index 000000000..fc7078da4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/source_issue.md
@@ -0,0 +1,8 @@
+---
+name: "Extension/source/catalogue issue"
+about: "Do not open an issue here. See https://github.com/inorichi/tachiyomi-extensions"
+title: "THIS ISSUE IS IN THE WRONG REPO; SEE https://github.com/inorichi/tachiyomi-extensions"
+labels: "catalog"
+---
+
+DO NOT OPEN AN ISSUE IN THIS REPO. SEE https://github.com/inorichi/tachiyomi-extensions
\ No newline at end of file