diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 476d5ac65a..8cff461959 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -2,6 +2,7 @@ name: Bug Report
 description: File a bug report also known as an issue or problem.
 title: '[Bug]: '
 labels: ['needs triage', 'bug']
+type: Bug
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index e999cf23ae..b53352f6ed 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -2,6 +2,7 @@ name: Feature request
 description: Request a missing feature
 title: '[Feature] '
 labels: ['feature']
+type: Feature
 body:
   - type: markdown
     attributes:
diff --git a/upcoming-release-notes/5648.md b/upcoming-release-notes/5648.md
new file mode 100644
index 0000000000..e61af298fe
--- /dev/null
+++ b/upcoming-release-notes/5648.md
@@ -0,0 +1,7 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+Add issue types for bug reports and feature requests in GitHub issue templates.
+