diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 73b47b27ba4..92fd5418000 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: "[Bug]"
-labels: 'bug'
+labels: 'type:bug'
 assignees: ''
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
index f568e1ff2e6..1246128377a 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.md
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -2,7 +2,7 @@
 name: Improvement
 about: Improve something on this project
 title: "[IMPROVE]"
-labels: 'enhancement'
+labels: 'type:enhancement'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 34e85b37947..801a76c6b87 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: "[FR]"
-labels: 'new feature'
+labels: 'type:feature'
 assignees: ''
 
 ---
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 0d7abeedc14..785b2fe701c 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -10,7 +10,7 @@ jobs:
         with:
           mode: minimum
           count: 1
-          labels: "s-feature, m-feature, l-feature, build, refactor, tests, documentation, bug, enhancement"
+          labels: "size:XS, size:S, size:M, size:L, size:XL, type:feature, type:build, type:refactor, type:tests, type:docs, type:bug, type:enhancement, type:other"
       - uses: mheap/github-action-required-labels@v1
         with:
           mode: exactly