diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index ca78418b0b..cde9c390b1 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,5 +1,6 @@
-name: "Bug report form"
+name: "Bug report"
 description: "Report a bug that you identified in iTop"
+type: bug
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
index 6bc622058e..1457458851 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -1,38 +1,13 @@
-name: "Enhancement suggestion form"
+name: "Enhancement suggestion"
 description: "Suggest an improvement to iTop"
+type: feature
 body:
   - type: markdown
     attributes:
       value: |
         Please explain why you're creating this issue :
-        - Are you willing to create a PR for this enhancement ? If so, we'll indicate in the issue if we're interested in it.
-        - Then, please describe what's your improvement proposition.
-
-  - type: dropdown
-    id: willing_to_pr
-    attributes:
-      label: Are you willing to create (at a later stage) a PR for that?
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true
-
-  - type: input
-    id: itop_version
-    attributes:
-      label: iTop version
-      description: "Complete iTop version (e.g., 3.2.3)"
-    validations:
-      required: false
-
-  - type: input
-    id: php_version
-    attributes:
-      label: PHP version
-      description: "Complete PHP version (e.g., 8.4.20)"
-    validations:
-      required: false
+        - Please describe what's your improvement proposition.
+        - Then tell us if you're willing to create a PR for this enhancement ? If so, we'll indicate in the issue if we're interested in it.
 
   - type: textarea
     id: enhancement_details
@@ -44,6 +19,32 @@ body:
     validations:
       required: false
 
+  - type: input
+    id: itop_version
+    attributes:
+      label: iTop version (if appropriate)
+      description: "Complete iTop version (e.g., 3.2.3)"
+    validations:
+      required: false
+
+  - type: input
+    id: php_version
+    attributes:
+      label: PHP version (if appropriate)
+      description: "Complete PHP version (e.g., 8.4.20)"
+    validations:
+      required: false
+
+  - type: dropdown
+    id: willing_to_pr
+    attributes:
+      label: Are you willing to create (at a later stage) a PR for that?
+      options:
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true
+
   - type: upload
     id: additional_info
     attributes: