diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 312c900f..384c43da 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -39,3 +39,14 @@ assignees: ''
 <!-- Before filling in the final result, summarize the use-case and/or workflow in a comment and discuss it with the committers -->
 
 **To be filled by the one closing the issue.**
+
+### Tasks
+
+- [ ] Assign yourself as `assignee`;
+- [ ] Fix the issue;
+- [ ] Add a utest for this issue, if it's needed;
+- [ ] Document the code similar to how it's done for the other code;
+- [ ] Check and fix utests, coverage and lints; <!-- Check `run_checks.py` for how to run each tool -->
+- [ ] Update documentation if needed; <!-- `docs/source` for the pages and objects in the scripts, `docs/Makefile` for generating and viewing the documentation -->
+- [ ] Create Pull Request and fix possible workflow failures;
+- [ ] Add the `ready_for_review` label.
diff --git a/.github/ISSUE_TEMPLATE/enchancement.md b/.github/ISSUE_TEMPLATE/enchancement.md
index b8a22187..c83a714d 100644
--- a/.github/ISSUE_TEMPLATE/enchancement.md
+++ b/.github/ISSUE_TEMPLATE/enchancement.md
@@ -8,11 +8,9 @@ assignees: ''
 ---
 
 ## Description
-
 <!-- provide a description of the enhancement -->
 
 ## Goals
-
 <!-- describe the goals you want to achieve with this enhancement -->
 
 ## Final result
@@ -24,11 +22,10 @@ assignees: ''
 
 ### Tasks
 
-<!--
-An optional lists of tasks that need to be executed
-By using the list syntax ("[ ]"), github can track and visualize progress on the story.
--->
-
-- [ ] Task 1
-- [ ] Task 2
-- [ ] ...
+- [ ] Assign yourself as `assignee`;
+- [ ] Implement enhancement;
+- [ ] Document the code similar to how it's done for the other code;
+- [ ] Check and fix utests, coverage and lints; <!-- Check run_checks.py for how to run each tool -->
+- [ ] Update documentation if needed; <!-- docs/source for the pages and objects in the scripts, docs/Makefile for generating and viewing the documentation -->
+- [ ] Create Pull Request and fix possible workflow failures;
+- [ ] Add the `ready_for_review` label.