diff --git a/.github/ISSUE_TEMPLATE/bug_report_form.yml b/.github/ISSUE_TEMPLATE/bug_report_form.yml
index e04024cfc..f1c1bfb1b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_form.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report_form.yml
@@ -1,4 +1,4 @@
-name: Bug Report form
+name: 🐛 Bug Report form
 description: Report a bug using a form. Use this option by default
 title: "[Bug report]: "
 labels: ["bug"]
@@ -17,16 +17,14 @@ body:
 #     options:
 #       - label: I have checked the current created issues, and it seems there is no other issue like this one.
 #         required: true
-  - type: dropdown
-    id: issue_not_duplicated
+  - type: checkboxes
     attributes:
-      label: Issue duplicity
-      description: Please, before creating a new issue, check if there is another one like this one.
+      label: Code of Conduct
+      description: The Code of Conduct helps create a safe space for everyone. We require
+        that everyone agrees to it.
       options:
-        - NO
-        - YES
-    validations:
-      required: true
+        - label: I agree to follow this project's [Code of Conduct](link/to/coc)
+          required: true
   - type: input
     id: version
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request_form.yml b/.github/ISSUE_TEMPLATE/feature_request_form.yml
index ae530c502..8ae3158c8 100644
--- a/.github/ISSUE_TEMPLATE/feature_request_form.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request_form.yml
@@ -1,4 +1,4 @@
-name: Feature request form
+name: 🆒🆙 Feature request form
 description: Create a feature request using a form. Use this option by default
 title: "[Feature request]: "
 labels: ["enhancement"]
@@ -17,16 +17,6 @@ body:
 #     options:
 #       - label: It seems this feature is not requested yet
 #         required: true
-  - type: dropdown
-    id: feature_request_not_duplicated
-    attributes:
-      label: Feature request duplicity
-      description: Please, check there is no other feature request like this one to avoid duplicates.
-      options:
-        - NO
-        - YES
-    validations:
-      required: true
   - type: textarea
     id: suggestion
     attributes: