diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 96%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug_report.yml
index d91ee412c..15085bceb 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,9 +1,7 @@
----
 name: Bug report
-about: File a bug report
+description: File a bug report
 title: "[Bug]: "
-labels: ["needs-triage","bug"]
-assignees: ""
+labels: [needs-triage, bug]
 body:
   - type: markdown
     attributes:
@@ -75,4 +73,3 @@ body:
     attributes:
       value: |
         Thanks for filing a bug report!
----
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.yml
similarity index 94%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/feature_request.yml
index 09ed837f8..f7e1709da 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,9 +1,7 @@
----
 name: Feature request
-about: Propose a new feature
+description: Propose a new feature
 title: "[FR]: "
-labels: ["needs-triage","fr"]
-assignees: ""
+labels: [needs-triage, fr]
 body:
   - type: markdown
     attributes:
@@ -49,4 +47,3 @@ body:
     attributes:
       value: |
         Thanks for filing a feature request!
----