diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
index a2ed3b3a8..9b8f418da 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -1,6 +1,7 @@
 name: Bug report
 description: File a bug reports regarding the firmware.
-labels: ['bug']
+labels:
+  - bug
 body:
 - type: markdown
   attributes:
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.yml b/.github/ISSUE_TEMPLATE/02_feature_request.yml
index 4196dc81a..1c534b72b 100644
--- a/.github/ISSUE_TEMPLATE/02_feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/02_feature_request.yml
@@ -1,6 +1,7 @@
 name: Feature Request
 description: For feature requests regarding the firmware.
-labels: ['feature request']
+labels:
+  - enhancement
 body:
 - type: markdown
   attributes:
diff --git a/.github/ISSUE_TEMPLATE/03_problem-upgrading-the-firmware.yml b/.github/ISSUE_TEMPLATE/03_problem-upgrading-the-firmware.yml
index 03c88e76c..b53a31f62 100644
--- a/.github/ISSUE_TEMPLATE/03_problem-upgrading-the-firmware.yml
+++ b/.github/ISSUE_TEMPLATE/03_problem-upgrading-the-firmware.yml
@@ -1,6 +1,5 @@
 name: Firmware/boot issue
 description: If you are having firmware upgrade or booting problems.
-title: 'Problem upgrading the firmware or booting '
 labels:
   - firmware
 body: