diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 61e7a0c49c9..1bd054d0fde 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,6 +1,7 @@
 name: Bug Report
 description: Report a non-security sensitive bug in Keycloak
 labels: ["kind/bug", "status/triage"]
+type: bug
 body:
   - type: checkboxes
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
index 597a485f4eb..648f1f1a062 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -1,6 +1,7 @@
 name: Enhancement Request
 description: Request an enhancement to an existing feature
 labels: ["kind/enhancement", "status/triage"]
+type: enhancement
 body:
   - type: textarea
     id: description
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index 9972ae784b6..7e487f1ea90 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -1,6 +1,7 @@
 name: Feature Request
 description: Request a new feature to be added to Keycloak
 labels: ["kind/feature", "status/triage"]
+type: feature
 body:
   - type: textarea
     id: description
diff --git a/.github/ISSUE_TEMPLATE/milestone.yml b/.github/ISSUE_TEMPLATE/milestone.yml
index dfaa2d6fd52..df6fb374482 100644
--- a/.github/ISSUE_TEMPLATE/milestone.yml
+++ b/.github/ISSUE_TEMPLATE/milestone.yml
@@ -1,6 +1,7 @@
 name: Milestone
 description: Milestones are used to break up larger features
 labels: ["kind/milestone", "status/triage"]
+type: milestone
 body:
   - type: textarea
     id: description
diff --git a/.github/ISSUE_TEMPLATE/task.yml b/.github/ISSUE_TEMPLATE/task.yml
index 2c47a99cf65..1ebe861b6d5 100644
--- a/.github/ISSUE_TEMPLATE/task.yml
+++ b/.github/ISSUE_TEMPLATE/task.yml
@@ -1,6 +1,7 @@
 name: Task
 description: Any tasks that are not directly adding a new feature, enhancement or fixing a bug
 labels: ["kind/task"]
+type: task
 body:
   - type: textarea
     id: description