diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 79%
rename from .github/ISSUE_TEMPLATE
rename to .github/ISSUE_TEMPLATE/bug_report.yml
index 36f8eb1..3ca8681 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -2,26 +2,30 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-name: Issue Report
-description: File an issue report.
+name: Bug Report
+description: File a bug report.
 title: "bug: "
 projects: ["outpost-os/1"]
 assignees:
   - fvalette-ledger
+  - pthierry-ledger
+labels: ["bug"]
+  
 body:
   - type: markdown
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report!
-        please prefix with:
-        - bug: for any bug report
-        - enhancement: for proposed cleaning fix
-        - feature: for proposed new feature
   - type: textarea
     id: what-happened
     attributes:
       label: What happened?
       description: What is the problem or what is asked ?
+  - type: textarea
+    id: dts-utils version
+    attributes:
+      label: What dts-utils version is impacted
+      description: dts-utils version used
     validations:
       required: true
   - type: dropdown
@@ -40,3 +44,4 @@ body:
       label: Relevant log output
       description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
       render: shell
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..2f5b97f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,24 @@
+# SPDX-FileCopyrightText: 2024 Ledger SAS
+#
+# SPDX-License-Identifier: Apache-2.0
+
+name: Proposing a feature/enancement
+description: File an evolution proposition
+title: "feature: "
+projects: ["outpost-os/1"]
+assignees:
+  - fvalette-ledger
+  - pthierry-ledger
+labels: ["bug"]
+  
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for proposing a new feature or an evolution!
+  - type: textarea
+    id: description
+    attributes:
+      label: What is proposed ?
+      description: feature/enhancement proposal
+