diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index da7d2070..bbe30e0f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,8 +1,8 @@
 name: Bug Report
 description: Report an issue with the Agent365 Python SDK.
 title: "[BUG] - [short description]"
-labels: bug
-assignees: ''
+labels: ["bug"]
+assignees: []
 
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index ae1fd849..e4fa4bb3 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,8 +1,8 @@
 name: Feature Request
 description: Suggest a new feature or improvement for the Agent365 Python SDK.
 title: "[FEATURE] - [short description]"
-labels: enhancement
-assignees: ''
+labels: ["enhancement"]
+assignees: []
 
 body:
   - type: markdown