diff --git a/.github/ISSUE_TEMPLATE/data-request.md b/.github/ISSUE_TEMPLATE/data-request.md
deleted file mode 100644
index ec6d84493..000000000
--- a/.github/ISSUE_TEMPLATE/data-request.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: Data Request
-about: 'Suggest a new field or enhancement for a field '
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-# What do you want to change?
-
-- [ ] Serie
-- [ ] Set
-- [ ] Card
-
-# What change do you want to do?
-_Describe the change(s) you want to be added/enhanced_
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
new file mode 100644
index 000000000..4a6777242
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -0,0 +1,30 @@
+name: Enhancement
+description: You have an Idea that will enhance the API, Use this issue Template!
+title: "[Up]: "
+labels: [project/database, project/server, project/compiler, type/enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this Form!
+  - type: checkboxes
+    id: data-type
+    validations:
+      required: true
+    attributes:
+      label: Data affected
+      description: Select the types of data that will be affected by you enhancement
+      options:
+        - label: Card
+        - label: Set
+        - label: Serie
+        - label: Other
+        - label: new Data Type
+  - type: textarea
+    id: explain
+    attributes:
+      label: Please explain in more details what idea you have
+      description: If you selected Other or new Data Type please put it as the first line
+      placeholder: "Ex: I would love to see the cards have this new field..."
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/incorrect-data.yml b/.github/ISSUE_TEMPLATE/incorrect-data.yml
new file mode 100644
index 000000000..b4ef67a45
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/incorrect-data.yml
@@ -0,0 +1,26 @@
+name: Incorect Data
+description: Use this when you found an incorrect information on a card/set/serie
+title: "[Data]: "
+labels: [project/database, type/incorect-data]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to help correct incorrect informations about the database!
+        It should take less than a day to get an answer!
+  - type: textarea
+    id: incorrect
+    attributes:
+      label: Path of the incorrect file(s)
+      description: Fill the different files that have incorrect informations (one per line) (you can use * if it concern a lot of files)
+      placeholder: "ex: data/Sword & Shield/Sword & Shield/1.ts"
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Incorrect informations
+      description: Describe the incorrect informations
+      placeholder: "ex: The cards have an incorrect name"
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/missing-card-informations.md b/.github/ISSUE_TEMPLATE/missing-card-informations.md
deleted file mode 100644
index d5e166181..000000000
--- a/.github/ISSUE_TEMPLATE/missing-card-informations.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Missing Card Informations
-about: Use this template to add missing/incorrect card informations
-title: ''
-labels: Card
-assignees: ''
-
----
-
-# Card Idientifier
-
-- Serie: serie_name
-- Set: set_name
-- card: card_identifier (generaly found in the bottom left for recent cards/right for older cards)
-
-# Changes
-
-Describe the changes needed to the card (New card, change in card informations, etc)
diff --git a/.github/ISSUE_TEMPLATE/new-set.yml b/.github/ISSUE_TEMPLATE/new-set.yml
new file mode 100644
index 000000000..b3b96b6f2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/new-set.yml
@@ -0,0 +1,17 @@
+name: New Set
+description: Use this Issue Template when you found a New set!
+title: "[Set]: {Set Name}"
+labels: [type/new-set, project/database]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this set informations
+  - type: input
+    id: source
+    attributes:
+      label: Source
+      description: Where did you find out about this new set
+      placeholder: "ex: https://www.pokemon.com/us/pokemon-tcg/sword-shield-evolving-skies/explore-and-watch/"
+    validations:
+      required: true