diff --git a/.github/workflows/ai-issues.yml b/.github/workflows/ai-issues.yml
index dba4fd79d3..8e6f1863e4 100644
--- a/.github/workflows/ai-issues.yml
+++ b/.github/workflows/ai-issues.yml
@@ -38,19 +38,22 @@ jobs:
 
           Issue number: ${{ github.event.issue.number }}
 
-          Lookup the contents of the issue using the following command:
+          Lookup the contents of the issue using the following `gh` command:
 
           ```bash
           gh issue view ${{ github.event.issue.number }} --json title,body,url,number
           ```
 
-          Perform the following task and then post a SINGLE comment (if needed).
+          Next, perform the following task and then post a SINGLE comment (if needed).
 
           ---
 
           TASK : FIND RELATED ISSUES
 
-          Search through existing issues (excluding #${{ github.event.issue.number }}) to find related or similar issues.
+          Using the `gh` CLI tool, search through existing issues on Github.
+          Find related or similar issues to the newly created one and list them.
+          Do not list the new issue itself (it is #${{ github.event.issue.number }}).
+
           Consider:
           1. Similar titles or descriptions
           2. Same error messages or symptoms
@@ -63,16 +66,22 @@ jobs:
 
           Based on your findings, post a SINGLE comment on issue #${{ github.event.issue.number }}. Build the comment as follows:
 
-          If no related issues were found, do NOT comment at all.
-
-          If related issues were found, include a section listing them with links using the following format:
+          - If no related issues were found, do NOT comment at all.
+          - If related issues were found, include a section listing them with links using the following format:
 
           [comment]
-          This issue might be similar or related to:
-          - #[issue_number]: [brief description of how they are related]
+          This issue might be similar or related to the following issue(s):
+
+            - #[related_issue_number]: [brief description of how they are related]
+            - #[related_issue_number]: [brief description of how they are related]
+            ...
 
           _This comment was auto-generated locally using **$GA_ENGINE** on **$GA_MACHINE**_
           [/comment]
 
-          Remember: Do not include the comment tags in your actual comment. Post at most ONE comment combining all findings. If everything is fine, post nothing.
+          Remember:
+            - Do not include the comment tags in your actual comment.
+            - Post at most ONE comment combining all findings.
+            - If you didn't find issues that are related enough, post nothing.
+            - You have access only to the `gh` CLI tool - don't try to use other tools.
           "