diff --git a/.github/ISSUE_TEMPLATE/technical-sub-task.md b/.github/ISSUE_TEMPLATE/technical-sub-task.md
deleted file mode 100644
index f413c0ceb8..0000000000
--- a/.github/ISSUE_TEMPLATE/technical-sub-task.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: 🧩  Technical sub-task
-about: Specify an optional technical sub-task for a user story. 
-title: ''
-labels: 'sub-task,:release,#cx'
-assignees: ''
-
----
-
-## Related user story
-
-TODO
-<!-- A technical sub-task always belongs to exactly one story.  The parent user story for this technical sub-task is linked here.   -->
-
-## Task
-
-TODO
-<!-- 
-- What needs to be done.
--->
-
-## Condition of satisfaction
-
-TODO
-
-<!--
-Describe the conditions that will resolve this issue.  The "definition of done".
--->
-
-
diff --git a/.github/ISSUE_TEMPLATE/unestimated-sub-task.md b/.github/ISSUE_TEMPLATE/unestimated-sub-task.md
new file mode 100644
index 0000000000..7acd4d81ac
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/unestimated-sub-task.md
@@ -0,0 +1,24 @@
+---
+name: 🧩  Unestimated sub-task
+about: "Specify an unestimated sub-task. (Avoid comments.  Use only as prescribed.)"
+title: ''
+labels: 'sub-task,:release,#mdm'
+assignees: ''
+
+---
+
+## Related user story
+
+TODO
+<!-- An unestimated sub-task always belongs to exactly one story.  The parent user story for this technical sub-task is linked here.   Comment on the parent story, not on this sub-task. -->
+
+## Task
+
+TODO
+<!-- What needs to be done. -->
+
+## Condition of satisfaction
+
+TODO
+
+<!-- Describe the conditions of satisfaction that will resolve this issue.  The "definition of done". It is always up to contributors to check their own work.  But especially keep in mind there is no external quality assurance check for sub-tasks.  (Only user stories get automatic external QA.  With unestimated sub-tasks, it's up to you.)  -->