diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 38e119358ae..1944bbd443a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,10 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
+# legacy classification using labels
 labels: 'bug'
+# new native Issue Type https://github.com/orgs/community/discussions/148715
+type: 'bug'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/work_item.md b/.github/ISSUE_TEMPLATE/feature.md
similarity index 53%
rename from .github/ISSUE_TEMPLATE/work_item.md
rename to .github/ISSUE_TEMPLATE/feature.md
index 8330f2770bf..96751077f47 100644
--- a/.github/ISSUE_TEMPLATE/work_item.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -1,8 +1,11 @@
 ---
-name: Work Item
-about: A unit of work that (maybe) needs to be done
+name: Feature
+about: A request, idea, or new functionality
 title: ''
+# legacy classification using labels
 labels: 'enhancement'
+# new native Issue Type https://github.com/orgs/community/discussions/148715
+type: 'feature'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/task.md b/.github/ISSUE_TEMPLATE/task.md
new file mode 100644
index 00000000000..800b500e632
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/task.md
@@ -0,0 +1,15 @@
+---
+name: Task
+about: A specific piece of work
+title: ''
+# new native Issue Type https://github.com/orgs/community/discussions/148715
+type: 'task'
+assignees: ''
+
+---
+
+# What
+
+## Why
+
+## How