diff --git a/.github/ISSUE_TEMPLATE/task.md b/.github/ISSUE_TEMPLATE/task.md
index 21220b140b..7ea32464e3 100644
--- a/.github/ISSUE_TEMPLATE/task.md
+++ b/.github/ISSUE_TEMPLATE/task.md
@@ -8,6 +8,7 @@ assignees: ''
 
 As a [type of user], I want [some goal] so that [some reason].
 
-**Acceptance criteria**
-- [ ] ...
+```[tasklist]
+### Acceptance Criteria
 - [ ] ...
+```
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 81cc76f12a..557cafe0a7 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,3 +1,5 @@
+```[tasklist]
+### Definition of Ready
 - [ ] I am happy with the code
 - [ ] Short description of the feature/issue is added in the pr description
 - [ ] PR is linked to the corresponding user story
@@ -10,4 +12,4 @@
 - [ ] Documentation/examples are up-to-date
 - [ ] All non-functional requirements are met
 - [ ] Functionality of the acceptance criteria is checked manually on the dev system.
-
+```