diff --git a/.github/ISSUE_TEMPLATE/bug_resolution.yml b/.github/ISSUE_TEMPLATE/bug_resolution.yml
index 0d900d11b..b2aac1e5d 100644
--- a/.github/ISSUE_TEMPLATE/bug_resolution.yml
+++ b/.github/ISSUE_TEMPLATE/bug_resolution.yml
@@ -14,13 +14,13 @@ body:
       label: I've found a bug and checked that ...
       description: Prior to placing the issue, please check following:** *(fill out each checkbox with an `X` once done)*
       options:
-      - label: ... I understand that not following the below instructions will result in immediate closure and/or deletion of my issue.
+      - label: I understand that not following the below instructions will result in immediate closure and/or deletion of my issue.
         required: true
-      - label: ... I have understood that this bug report is dedicated for bugs, and not for support-related inquiries.
+      - label: I have understood that this bug report is dedicated for bugs, and not for support-related inquiries.
         required: true
-      - label: ... I have understood that answers are voluntary and community-driven, and not commercial support.
+      - label: I have understood that answers are voluntary and community-driven, and not commercial support.
         required: true
-      - label: ... I have verified that my issue has not been already answered in the past. I've read the [Common issues documentation section](https://docs.cryptpad.fr/en/FAQ.html#common-issues) and I also checked [previous issues](https://github.com/xwiki-labs/cryptpad/issues).
+      - label: I have verified that my issue has not been already answered in the past. I've read the [Common issues documentation section](https://docs.cryptpad.fr/en/FAQ.html#common-issues) and I also checked [previous issues](https://github.com/xwiki-labs/cryptpad/issues).
         required: true
   - type: textarea
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/new_feature.yml b/.github/ISSUE_TEMPLATE/new_feature.yml
index fcf71cae0..263d44776 100644
--- a/.github/ISSUE_TEMPLATE/new_feature.yml
+++ b/.github/ISSUE_TEMPLATE/new_feature.yml
@@ -1,7 +1,25 @@
 name: Feature Request
-description: Suggest an idea for CryptPad
-labels: ["feature request"]
+description: Suggest an idea for CryptPad.
+labels: ["Feature Request"]
 body:
+  - type: checkboxes
+    attributes:
+      label: Contribution guidelines
+      description: Please read the code of conduct before proceeding.
+      options:
+        - label: I've read the [code of conduct](https://github.com/xwiki-labs/cryptpad/blob/main/CODE_OF_CONDUCT.md) and wholeheartedly agree
+          required: true
+  - type: checkboxes
+    attributes:
+      label: I would like to request a new feature for CryptPad
+      description: Prior to creating a new issue, please check following:** *(fill out each checkbox with an `X` once done)*
+      options:
+      - label: I have searched past issues and labels to check that my question/idea does not exist
+        required: true
+      - label: I have understood that this report is dedicated for feature requests, and not for support-related inquiries.
+        required: true
+      - label: I have understood that answers are voluntary and community-driven, and not commercial support.
+        required: true
   - type: textarea
     attributes:
       label: Summary