diff --git a/.github/ISSUE_TEMPLATE/bug_resolution.md b/.github/ISSUE_TEMPLATE/bug_resolution.md
new file mode 100644
index 000000000..930a6a90e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_resolution.md
@@ -0,0 +1,36 @@
+# Contribution guidelines
+
+Please read the [code of conduct](https://github.com/xwiki-labs/cryptpad/blob/main/CODE_OF_CONDUCT.md) before proceeding.
+
+You've found a bug and checked that:
+
+- You understand that not following the below instructions will result in immediate closure and/or deletion of your issue.
+- You have understood that this bug report is dedicated for bugs, and not for support-related inquiries.
+- You have understood that answers are voluntary and community-driven, and not commercial support.
+- You have verified that your issue has not been already answered in the past. You've read the [Common issues documentation section](https://docs.cryptpad.org/en/FAQ.html#common-issues) and you also checked [previous issues](https://github.com/xwiki-labs/cryptpad/issues).
+
+# Description
+
+Please provide a brief description of the bug in 1-2 sentences. If applicable, add screenshots to help explain your problem. Very useful for bugs in CryptPad UI.
+
+# Steps to reproduce
+
+Please describe the steps to reproduce the bug. Screenshots can be added, if helpful.
+
+1. 
+2. 
+3. 
+
+# Expected behavior
+
+A clear and concise description of what you expected to happen.
+
+# System information
+
+| Question | Answer |
+| --- | --- |
+| Operating system and version | I_DO_REPLY_HERE |
+| Web browser and version| I_DO_REPLY_HERE |
+| Extensions installed | I_DO_REPLY_HERE |
+| Browser tweaks | I_DO_REPLY_HERE |
+| CryptPad version | I_DO_REPLY_HERE |
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_resolution.yml b/.github/ISSUE_TEMPLATE/bug_resolution.yml
deleted file mode 100644
index cd3cac997..000000000
--- a/.github/ISSUE_TEMPLATE/bug_resolution.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-name: Reproducible bug report
-description: Report a reproducible bug ONLY, otherwise see the links below
-labels: ["bug"]
-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'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.
-        required: true
-      - 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.
-        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.org/en/FAQ.html#common-issues) and I also checked [previous issues](https://github.com/xwiki-labs/cryptpad/issues).
-        required: true
-  - type: textarea
-    attributes:
-      label: Description
-      description: Please provide a brief description of the bug in 1-2 sentences. If applicable, add screenshots to help explain your problem. Very useful for bugs in CryptPad UI.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Steps to reproduce
-      description: Please describe the steps to reproduce the bug. Screenshots can be added, if helpful.
-      placeholder: |-
-        1. ...
-        2. ...
-        3. ...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: A clear and concise description of what you expected to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: System information
-      description: In this stage we would kindly ask you to attach general system information about your setup.
-      value: |-
-             | Question | Answer |
-             | --- | --- |
-             | Operating system and version | I_DO_REPLY_HERE |
-             | Web browser and version| I_DO_REPLY_HERE |
-             | Extensions installed | I_DO_REPLY_HERE |
-             | Browser tweaks | I_DO_REPLY_HERE |
-             | CryptPad version | I_DO_REPLY_HERE |
-    validations:
-      required: true