diff --git a/.github/ISSUE_TEMPLATE/bug-desktop.yml b/.github/ISSUE_TEMPLATE/bug-desktop.yml
index 809fd812cc..c601c0c9bc 100644
--- a/.github/ISSUE_TEMPLATE/bug-desktop.yml
+++ b/.github/ISSUE_TEMPLATE/bug-desktop.yml
@@ -57,3 +57,14 @@ body:
       placeholder: e.g. From https://element.io/get-started
     validations:
       required: false
+  - type: dropdown
+    id: rageshake
+    attributes:
+      label: Have you submitted 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
diff --git a/.github/ISSUE_TEMPLATE/bug-web.yml b/.github/ISSUE_TEMPLATE/bug-web.yml
index 0010684a4a..e407245ab3 100644
--- a/.github/ISSUE_TEMPLATE/bug-web.yml
+++ b/.github/ISSUE_TEMPLATE/bug-web.yml
@@ -57,3 +57,14 @@ body:
       placeholder: e.g. develop.element.io, app.element.io
     validations:
       required: false
+  - type: dropdown
+    id: rageshake
+    attributes:
+      label: Have you submitted a rageshake?
+      description:  |
+        Did you know that you can send a /rageshake command from the web applicaiton 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