diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 52f1a862e..936ed7adc 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -24,13 +24,16 @@ _reason_
 
 ### TODO
 
--   [ ] _task_
+- [ ] Tests added
+- [ ] PRs for all affected apps created
+- [ ] Storybook added
+- [ ] _todo_
 
 ---
 
 ### Known issues
 
--   [ ] _issue_
+- [ ] _issue_
 
 ---
 
diff --git a/.github/workflows/check-tasklist.yml b/.github/workflows/check-tasklist.yml
new file mode 100644
index 000000000..9620c6871
--- /dev/null
+++ b/.github/workflows/check-tasklist.yml
@@ -0,0 +1,14 @@
+name: GitHub Task List Checker
+on:
+    pull_request:
+        types: [opened, edited, synchronize, reopened]
+
+jobs:
+    task-list-checker:
+        if: ${{ github.actor != 'dependabot[bot]' }}
+        runs-on: ubuntu-latest
+        steps:
+            - name: Check for incomplete task list items
+              uses: Shopify/task-list-checker@main
+              with:
+                  github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.prettierrc.js b/.prettierrc.js
index def7934e3..4ae21dd3c 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -2,4 +2,12 @@ const { config } = require('@dhis2/cli-style')
 
 module.exports = {
     ...require(config.prettier),
+    overrides: [
+        {
+            files: 'pull_request_template.md',
+            options: {
+                tabWidth: 2,
+            },
+        },
+    ],
 }