diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index bd282b70..5c6e1f32 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -8,19 +8,22 @@ assignees:
 
 body:
 
-  - type: dropdown
-    id: research
+  - type: markdown
     attributes:
-      label: Did you already look into this bug?
-      description: Please invest some time and check if this bug is already mentioned or documented elsewhere
-      multiple: true
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+  - type: checkboxes
+    attributes:
+      label: Have you already looked into this bug?
+      description: Please invest some time and check if this bug is already mentioned or documented elsewhere (You may select more than one).
       options:
-        - I have read the [Troubleshooting Guide](https://devilbox.readthedocs.io/en/latest/support/troubleshooting.html)
-        - I have checked the [Devilbox forum](https://devilbox.discourse.group/)
-        - I have googled this bug
-        - I have checked existing issues for similar bugs
-        - I have checked [Release notes](https://github.com/cytopia/devilbox/releases)
-        - I have not done anything yet
+        - label: I have read the [Troubleshooting Guide](https://devilbox.readthedocs.io/en/latest/support/troubleshooting.html)
+        - label: I have checked the [Devilbox forum](https://devilbox.discourse.group/)
+        - label: I have googled this bug already with no luck
+        - label: I have checked [existing issues](https://github.com/cytopia/devilbox/issues) for similar bugs
+        - label: I have checked [Release notes](https://github.com/cytopia/devilbox/releases)
+        - label: I have not done anything yet
     validations:
       required: true
 
@@ -40,6 +43,14 @@ body:
     validations:
       required: true
 
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: How can we reproduce the bug?
+      description: "How do you trigger this bug? Please walk us through it step by step (This is crucial in order to triage the bug)."
+    validations:
+      required: true
+
   - type: dropdown
     id: host-os
     attributes:
@@ -110,23 +121,15 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    id: steps-to-reproduce
-    attributes:
-      label: How can we reproduce the bug?
-      description: "How do you trigger this bug? Please walk us through it step by step."
-    validations:
-      required: true
-
   - type: textarea
     id: log-env-file
     attributes:
-      label: "Log: `.env` file"
+      label: "Log: .env file"
       description: "Please copy and paste your `.env` file into this text aread"
   - type: textarea
     id: log-docker-compose
     attributes:
-      label: "Log: `docker-compose logs`"
+      label: "Log: docker-compose logs"
       description: "Please copy and paste the output of `docker-compose logs` into this text aread"
       render: shell
     validations:
@@ -135,8 +138,15 @@ body:
   - type: textarea
     id: log-check-config
     attributes:
-      label: "Log: `./check-config.sh`"
+      label: "Log: ./check-config.sh"
       description: "Please copy and paste the output of `./check-config.sh` into this text aread"
       render: shell
     validations:
       required: true
+
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: Add any additional information that might help with this bug report.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/howto.yml b/.github/ISSUE_TEMPLATE/howto.yml
index 22d0afba..890a0043 100644
--- a/.github/ISSUE_TEMPLATE/howto.yml
+++ b/.github/ISSUE_TEMPLATE/howto.yml
@@ -1,8 +1,8 @@
 ---
-name: "\U0001F41B How to do ...?"
+name: "❔ How to do ...?"
 description: How do I do X or Y with the Devilbox?
 title: "[Howto]: "
-labels: ["question"]
+labels: ["question", "Community help wanted"]
 assignees:
   - cytopia