diff --git a/.github/ISSUE_TEMPLATE/chore.md b/.github/ISSUE_TEMPLATE/chore.md
index 39c177d33..fc982a629 100644
--- a/.github/ISSUE_TEMPLATE/chore.md
+++ b/.github/ISSUE_TEMPLATE/chore.md
@@ -14,8 +14,7 @@ What we need to achieve and who for
 
 ## Tasks
 
-- [ ] What do we need to do first
-- [ ] and then what?
-- [ ] Etc.
+- [ ]
+- [ ]
 
 ## Additional details / background info
diff --git a/.github/ISSUE_TEMPLATE/user-story.md b/.github/ISSUE_TEMPLATE/user-story.md
index 3121b6c05..a46afaa42 100644
--- a/.github/ISSUE_TEMPLATE/user-story.md
+++ b/.github/ISSUE_TEMPLATE/user-story.md
@@ -22,11 +22,14 @@ So that
 
 ## Tasks
 
-- [ ] Explore and sketch
+- [ ] UX (if needed)
+- [ ] Design (if needed)
 - [ ] Team and stakeholder review
-- [ ] Visual Design
-- [ ] Team review
-- [ ] Etc.
+- [ ] Specs reviewed and created or adjusted
+- [ ] Implementation
+- [ ] Testing (unit and/or e2e)
+- [ ] Code review
+- [ ] QA review
 
 ## Sketch