diff --git a/.github/ISSUE_TEMPLATE/🐞-bug-report.md b/.github/ISSUE_TEMPLATE/🐞-bug-report.md
deleted file mode 100644
index c8797de..0000000
--- a/.github/ISSUE_TEMPLATE/🐞-bug-report.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: "\U0001F41E Bug report"
-about: Create a report to help us improve
-title: ''
-labels: Bug
-assignees: 0PandaDEV
-
----
-
-**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.
-
-**Operating system**
-Windows or Linux
-
-**Version of Qopy**
-0.1.0
-
-**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..e4b18ca
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/🐞-bug-report.yml
@@ -0,0 +1,68 @@
+name: "\U0001F41E Bug report"
+description: Create a report to help us improve
+labels: [Bug]
+assignees: 
+  - 0PandaDEV
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Steps to reproduce the behavior
+      value: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain your problem.
+    validations:
+      required: false
+
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating system
+      options:
+        - Windows
+        - Linux
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: Version of Qopy
+      placeholder: e.g. 0.1.0
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/💡-feature-request.md b/.github/ISSUE_TEMPLATE/💡-feature-request.md
deleted file mode 100644
index ab75678..0000000
--- a/.github/ISSUE_TEMPLATE/💡-feature-request.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: "\U0001F4A1 Feature request"
-about: Suggest an idea for this project
-title: ''
-labels: Feature
-assignees: 0PandaDEV
-
----
-
-**Describe your requested feature**
-Give as many details as possible
diff --git a/.github/ISSUE_TEMPLATE/💡-feature-request.yml b/.github/ISSUE_TEMPLATE/💡-feature-request.yml
new file mode 100644
index 0000000..cbf9437
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/💡-feature-request.yml
@@ -0,0 +1,13 @@
+name: "\U0001F4A1 Feature request"
+description: Suggest an idea for this project
+labels: [Feature]
+assignees: 
+  - 0PandaDEV
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe your requested feature
+      description: Give as many details as possible about your feature idea.
+    validations:
+      required: true
\ No newline at end of file