diff --git a/.github/ISSUE_TEMPLATE/crash_report.md b/.github/ISSUE_TEMPLATE/crash_report.md
index 0b0350a12..1118ac13e 100644
--- a/.github/ISSUE_TEMPLATE/crash_report.md
+++ b/.github/ISSUE_TEMPLATE/crash_report.md
@@ -1,12 +1,17 @@
 ---
 name: Crash report
 about: Submit a crash report
-title: '[CRASH]'
+title: '[CRASH] <short description>'
 labels: ''
 assignees: ''
 
 ---
 
+Notice!
+- If a Redis module was involved, please open an issue in the module's repo instead!
+- If you're using docker on Apple M1, please make sure the image you're using was compiled for ARM!
+
+
 **Crash report**
 
 Paste the complete crash log between the quotes below. Please include a few lines from the log preceding the crash report to provide some context.
diff --git a/src/debug.c b/src/debug.c
index 081cb862f..f394f867c 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -2014,7 +2014,9 @@ void bugReportEnd(int killViaSignal, int sig) {
 "\n=== REDIS BUG REPORT END. Make sure to include from START to END. ===\n\n"
 "       Please report the crash by opening an issue on github:\n\n"
 "           http://github.com/redis/redis/issues\n\n"
+"  If a Redis module was involved, please open in the module's repo instead.\n\n"
 "  Suspect RAM error? Use redis-server --test-memory to verify it.\n\n"
+"  Some other issues could be detected by redis-server --check-system\n"
 );
 
     /* free(messages); Don't call free() with possibly corrupted memory. */