diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b79635883..e56732951 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,6 +7,14 @@ assignees: ''
 
 ---
 
+**Checklist**
+[ ] I can reproduce the bug with the latest version. 
+[ ] I made sure that there are no existing issues - open or closed - to which I could contribute my information to.
+[ ]  I have read the FAQ and my problem isn't listed.
+[ ]  I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise.
+[ ]  This issue contains only one bug.
+[ ]  I have read and understood the [contribution guidelines.](https://github.com/FossifyX/General-Discussion?tab=readme-ov-file#contribution-rules-for-developers)
+
 **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 11fc491ef..e1e266de0 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,6 +7,13 @@ assignees: ''
 
 ---
 
+**Checklist**
+[ ] I made sure that there are no existing issues - open or closed - to which I could contribute my information.
+[ ]  I have read the FAQ and my problem isn't listed.
+[ ]  I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise.
+[ ]  This issue contains only one feature request.
+[ ]  I have read and understood the [contribution guidelines.](https://github.com/FossifyX/General-Discussion?tab=readme-ov-file#contribution-rules-for-developers)
+
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]