diff --git a/.github/workflows/martian-test-failure.yml b/.github/workflows/martian-test-failure.yml
index bd0df80a2..927816cf2 100644
--- a/.github/workflows/martian-test-failure.yml
+++ b/.github/workflows/martian-test-failure.yml
@@ -104,27 +104,30 @@ jobs:
           </details>
 
           # Important Guidelines
-          - Be concise and actionable - developers want to quickly understand and fix the issue
+          - Be concise and actionable - developers want to quickly understand and fix the issue. Provide
+            additional context, references, etc in collapsible details blocks to ensure that the comment you're adding
+            is short and easy to read but additional information is a click away.
           - Focus on facts from the logs and code, not speculation
           - If you can't determine the root cause, say so clearly
+          - If your only suggestion is a bad suggestion (disable the test, change the timeout, etc), indicate that you've run out of ideas and
+            that they probably don't want to do that.
           - Provide specific file names, line numbers, and code references when possible
           - You can run make commands (e.g., `make lint`, `make typecheck`, `make sync`) to build, test, or lint the code
           - You can also run git commands (e.g., `git status`, `git log`, `git diff`) to inspect the repository
           - You can use WebSearch and WebFetch to research errors, stack traces, or related issues
           - For bash commands, you are limited to make and git commands only
 
-          # CRITICAL: Loop Detection
-          **IMPORTANT**: Before posting your analysis, check the PR comments to detect if there's a loop where:
-          - CodeRabbit or another bot triggered this workflow
-          - Your previous analysis triggered CodeRabbit or another bot
-          - This created a repeating cycle of bot comments
-
           # CRITICAL: ANGRY USERS
           **IMPORTANT**: If the user is angry with you, the triage bot, don't respond. Just exit immediately without further action.
+            If at any point in the conversation the user has asked you to stop replying to the thread, just exit immediately.
 
-          If you detect such a loop (e.g., you see multiple similar bot comments or your own previous analysis comments):
-          1. **DO NOT** post another analysis comment
-          2. Exit immediately without further action
+          If you are posting the same suggestion as you have previously made, do not post the suggestion again.
+
+          # IMPORTANT: EDIT YOUR COMMENT
+          Do not post a new comment every time you triage a failing workflow. If a previous comment has been posted by you (marvin)
+          in a previous triage, edit that comment do not add a new comment for each failure. Be sure to include a note that you've edited
+          your comment to reflect the latest analysis. Don't worry about keeping the old content around, there's comment history for 
+          that.
 
           # Problems Encountered
           If you encounter any problems during your analysis (e.g., unable to fetch logs, tools not working), document them clearly so the team knows what limitations you faced.