diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 19ee8be..79c7e04 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,6 +10,7 @@ assignees: ''
 **Prerequisites**
 <!-- Please ensure your request is not part of an existing issue. -->
 <!-- Please ensure you have checked the Obtainium Wiki. -->
+<!-- Please ensure your request is an actual bug and not intended behaviour (this is frequently the case for issues involving version strings and the HTML source. -->
 
 **Describe the bug**
 <!-- A clear and concise description of what the bug is. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 8c28a74..67ac8f9 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -14,11 +14,14 @@ assignees: ''
 **Describe the feature**
 <!-- A clear and concise description of what you want to happen.
 
-For new Sources, it's preferable (not required) if you suggest how the following details can be extracted from the Source in a reliable way (like an API or through web scraping):
+For new Sources, please ensure:
+1. It is not already possible to use the HTML Source for your purposes.
+2. It must be possible to extract the following details from the Source in a reliable way:
 - The App version (or any release-specific identifier - a "pseudo-version") for the latest release
 - One or more APK URL(s) for the latest release
 - Above details for previous releases (optional)
 
+If you're not sure about 1 or 2, open a discussion item instead.
 Note that the Web scraper cannot deal with JavaScript-enabled content. -->
 
 **Describe alternatives you've considered (if applicable)**