diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 0fde91665..85c720929 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,9 +1,10 @@
 ---
 name: Bug
-description: Report incorrect behavior, regressions, or broken flows
+about: Used for bug reports
 title: "[Bug] "
-labels:
-  - bug
+labels: bug, enhancement
+assignees: ''
+
 ---
 
 ## Summary
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 68957eac4..c9732c413 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -1,9 +1,10 @@
 ---
 name: Feature
-description: Propose a new capability with tests and code documentation
+about: Used for new features or suggestions
 title: "[Feature] "
-labels:
-  - enhancement
+labels: enhancement
+assignees: ''
+
 ---
 
 ## Summary