diff --git a/.github/ISSUE_TEMPLATE/epic.md b/.github/ISSUE_TEMPLATE/epic.md
index 4559de2efc29a..ec6bcf17f8d83 100644
--- a/.github/ISSUE_TEMPLATE/epic.md
+++ b/.github/ISSUE_TEMPLATE/epic.md
@@ -3,7 +3,7 @@ name: Epic
 about: Template for epics. Epics group several user stories together into a main piece
   of added value.
 title: ''
-labels: "epic"
+type: "🎯 Epic"
 assignees: ''
 
 ---
@@ -18,4 +18,4 @@ assignees: ''
 ### Who for
 
 ### Part of
-- #525 <!-- Please remplace 525 by the most specific parent issue possible -->
\ No newline at end of file
+- #525 <!-- Please remplace 525 by the most specific parent issue possible -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index f83cbf30b9965..e50bc15296215 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-labels: 'feature'
+labels: '✨ Enhancement'
 ---
 
 ### Problem
diff --git a/.github/ISSUE_TEMPLATE/task.md b/.github/ISSUE_TEMPLATE/task.md
index 3b92554960785..77d04baa03464 100644
--- a/.github/ISSUE_TEMPLATE/task.md
+++ b/.github/ISSUE_TEMPLATE/task.md
@@ -3,7 +3,7 @@ name: Task
 about: Template for tasks. Tasks are a small unit of work, usually resulting of breaking
   down a user story or other bigger items of a sprint backlog.
 title: ''
-labels: 'task'
+type: '✅ Task'
 assignees: ''
 
 ---