diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 944a95723e..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-name: 🛠 Bug report
-about: Create a report to help us improve
-title: "Good bug title tells us about precise symptom, not about the root cause."
-labels: "bug"
-assignees: ""
----
-
-## Description
-<!-- A clear and concise description of what the bug is. -->
-
-## Steps to reproduce
-<!-- Steps to reproduce the behavior:
-1. Run ...
-2. ...
-3. ... -->
-
-## Current behavior
-<!-- What happens actually so you think this is a bug. -->
-
-## Desired behavior
-<!--
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
--->
-
-## Environment
-<!--
-For older commitizen versions, please include the
-output of the following commands manually:
-
-cz version
-python --version
-python3 -c "import platform; print(platform.system())"
--->
-Add output of the following command to include the following
-- commitizen version:
-- python version:
-- operating system:
-```bash
-cz version --report
-```
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000..69031d736d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,61 @@
+name: 🛠 Bug report
+description: Create a report to help us improve
+title: Good bug title tells us about precise symptom, not about the root cause.
+labels: [bug]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        A clear and concise description of what the bug is
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Steps to reproduce the behavior
+      placeholder: |
+        1. Run ...
+        2. ...
+        3. ...
+    validations:
+      required: true
+  - type: textarea
+    id: current-behavior
+    attributes:
+      label: Current behavior
+      description: What happens actually so you think this is a bug.
+    validations:
+      required: true
+  - type: textarea
+    id: desired-behavior
+    attributes:
+      label: Desired 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.
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: |
+        For older commitizen versions, please include the output of the following commands manually
+      placeholder: |
+        - commitizen version: `cz version`
+        - python version: `python --version`
+        - operating system: `python3 -c "import platform; print(platform.system())"`
+        
+        ```bash
+        cz version --report
+        ```
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..884fe1663a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,6 @@
+# Configuration: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository
+
+blank_issues_enabled: false
+contact_links:
+  - name: Security Contact
+    about: Please report security vulnerabilities to santiwilly@gmail.com
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
deleted file mode 100644
index f96cfff7bc..0000000000
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: 📖 Documentation
-about: Suggest an improvement for the documentation of this project
-title: "Content to be added or fixed"
-labels: "documentation"
-assignees: ""
----
-
-## Type
-
-* [ ] Content inaccurate
-* [ ] Content missing
-* [ ] Typo
-
-## URL
-<!-- URL to the code we did not clearly describe or the document page where the content is inaccurate -->
-
-## Description
-<!-- A clear and concise description of what content should be added or fixed -->
diff --git a/.github/ISSUE_TEMPLATE/documentation.yml b/.github/ISSUE_TEMPLATE/documentation.yml
new file mode 100644
index 0000000000..51d378b747
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.yml
@@ -0,0 +1,29 @@
+name: 📖 Documentation
+description: Suggest an improvement for the documentation of this project
+title: Content to be added or fixed
+labels: [documentation]
+body:
+  - type: checkboxes
+    id: type
+    attributes:
+      label: Type
+      options:
+        - label: Content inaccurate
+        - label: Content missing
+        - label: Typo
+  - type: input
+    id: url
+    attributes:
+      label: URL
+      placeholder: |
+        URL to the code we did not clearly describe or the document page where the content is inaccurate
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        A clear and concise description of what content should be added or fixed
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index b9d48126a4..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: 🚀 Feature request
-about: Suggest an idea for this project
-title: "<One feature request per issue>"
-labels: "feature"
-assignees: ""
----
-
-## Description
-<!-- A clear and concise description for us to know your idea. -->
-
-## Possible Solution
-<!-- A clear and concise description of what you want to happen. -->
-
-## Additional context
-<!-- Add any other context or screenshots about the feature request here. -->
-
-## Related Issue
-<!-- If applicable, add link to existing issue also help us know better. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000000..7d67eb18af
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,31 @@
+name: 🚀 Feature request
+description: Suggest an idea for this project
+title: "<One feature request per issue>"
+labels: [feature]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        A clear and concise description for us to know your idea.
+    validations:
+      required: true
+  - type: textarea
+    id: possible-solution
+    attributes:
+      label: Possible Solution
+      description: |
+        A clear and concise description of what you want to happen.
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: |
+        Add any other context or screenshots about the feature request here.
+  - type: textarea
+    id: related-issue
+    attributes:
+      label: Additional context
+      description: |
+        If applicable, add link to existing issue also help us know better.