diff --git a/.github/ISSUE_TEMPLATE/bug-desktop.yml b/.github/ISSUE_TEMPLATE/bug-desktop.yml
index 607dfdf1f..6bc02af94 100644
--- a/.github/ISSUE_TEMPLATE/bug-desktop.yml
+++ b/.github/ISSUE_TEMPLATE/bug-desktop.yml
@@ -20,6 +20,16 @@ body:
         3. More steps…
     validations:
       required: true
+  - type: dropdown
+    id: rageshake
+    attributes:
+      label: Have you done a rageshake?
+      description: Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type /rageshake into the message entry area, followed by a description of the problem and send the command. This will automatically submit anonymous logs to the developers
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
   - type: textarea
     id: what-happened
     attributes:
@@ -57,10 +67,3 @@ body:
       placeholder: e.g. From https://element.io/get-started
     validations:
       required: false
-  - type: checkboxes
-    id: logs
-    attributes:
-      label: Logs
-      options:
-        - label: I have sent logs
-          required: false
diff --git a/.github/ISSUE_TEMPLATE/bug-web.yml b/.github/ISSUE_TEMPLATE/bug-web.yml
index 9169868e9..e80ca5999 100644
--- a/.github/ISSUE_TEMPLATE/bug-web.yml
+++ b/.github/ISSUE_TEMPLATE/bug-web.yml
@@ -20,6 +20,16 @@ body:
         3. More steps…
     validations:
       required: true
+  - type: dropdown
+    id: rageshake
+    attributes:
+      label: Have you done a rageshake?
+      description: Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type /rageshake into the message entry area, followed by a description of the problem and send the command. This will automatically submit anonymous logs to the developers
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
   - type: textarea
     id: what-happened
     attributes:
@@ -57,10 +67,3 @@ body:
       placeholder: e.g. develop.element.io, app.element.io
     validations:
       required: false
-  - type: checkboxes
-    id: logs
-    attributes:
-      label: Logs
-      options:
-        - label: I have sent logs
-          required: false