diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 9376d63..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,37 +0,0 @@
-<!---
-  SPDX-FileCopyrightText: 2024 Ledger SAS
-  SPDX-License-Identifier: Apache-2.0
--->
-
----
-name: Bug report
-about: Create a report to help us improve
-title: 'bug: '
-labels: bug
-assignees: pthierry-ledger, fvalette-ledger
-projects: ['outpost-os/1']
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Python version [e.g. 3.12]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..ea08f50
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,47 @@
+# SPDX-FileCopyrightText: 2024 Ledger SAS
+#
+# SPDX-License-Identifier: Apache-2.0
+
+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!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: What is the problem or what is asked ?
+  - type: textarea
+    id: svd2json-version
+    attributes:
+      label: What svd2json version is impacted
+      description: svd2json version used
+    validations:
+      required: true
+  - type: dropdown
+    id: python-version
+    attributes:
+      label: What is the python version used ?
+      multiple: true
+      options:
+        - '3.10'
+        - '3.11'
+        - '3.12'
+        - '3.13+'
+  - type: textarea
+    id: logs
+    attributes:
+      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.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 08bdcb1..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!---
-  SPDX-FileCopyrightText: 2024 Ledger SAS
-  SPDX-License-Identifier: Apache-2.0
--->
-
----
-name: Feature request
-about: Suggest an idea for this project
-title: 'feature: '
-labels: feature
-assignees: pthierry-ledger, fvalette-ledger
-projects: ['outpost-os/1']
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
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
+