diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index ceb3df6e..aef5a4be 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -2,7 +2,8 @@
 name: Bug Report
 about: Report an issue with a package part of UI5 Tooling Extensions
 title: ''
-labels: bug, needs triage
+type: Bug
+labels: needs triage
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 0e36fe74..4e0fa3ef 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -2,7 +2,7 @@
 name: Feature Request
 about: Request a new feature to be added to a package part of UI5 Tooling Extensions
 title: ''
-labels: enhancement
+type: Feature
 assignees: ''
 
 ---
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3fb7e9b1..df3aa2e1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,11 +55,14 @@ Please also refer to the general [SAP security information page](https://www.sap
 
 GitHub offers labels to categorize issues. The labels can only be set and modified by committers.
 
-#### General issue categories:
+#### General issue types:
+
+- **`Bug`**: This issue is a bug in the code.
+- **`Feature`**: This is not a bug report, but an feature request.
+
+#### Specific issue categories for UI5 Tooling Extensions:
 
-- **`bug`**: This issue is a bug in the code.
 - **`documentation`**: This issue is about wrong documentation.
-- **`enhancement`**: This is not a bug report, but an enhancement request.
 - **`needs triage`**: This issue needs to be investigated and confirmed as a valid issue that is not a duplicate
 
 ##### Status of an open issue: