diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index c2ec40e..235c595 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -5,10 +5,10 @@ title: "[Bug] name your bug"
 labels: bug, invalid
 ---
 
-<!-- PLEASE READ THIS CAREFULLY :
-- Any issue which does not respect following template or lack of information will be considered as invalid and automatically closed
-- First check FAQ from wiki to see if your problem is not already known
--->
+- [ ] I didn't find a similar issue already open.
+- [ ] I read the documentation (README AND Wiki)
+- [ ] I have installed FFMpeg
+- [ ] My problem is related to Spleeter only, not a derivative product (such as Webapplication, or GUI provided by others)
 
 ## Description
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index bdb95c9..c03d7e7 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,6 @@
-# [Spleeter-XXXX] - pull request title
+# Pull request title
+
+- [ ] I read [contributing guideline](.github/CONTRIBUTING.md)
 
 ## Description
 
@@ -8,6 +10,10 @@ A few sentences describing the overall goals of the pull request's commits.
 
 You tested it, right?
 
+- [ ] I implemented unit test whicn ran successfully using `poetry run pytest tests/`
+- [ ] Code has been formatted using `poetry run black spleeter`
+- [ ] Imports has been formatted using `poetry run isort spleeter``
+
 ## Documentation link and external references
 
-Please provide any info that may help us better understand your code.
+Please provide any info that may help us better understand your code.
\ No newline at end of file