diff --git a/self-development/kelos-api-reviewer.yaml b/self-development/kelos-api-reviewer.yaml
index b0de1afe0..d8d5de049 100644
--- a/self-development/kelos-api-reviewer.yaml
+++ b/self-development/kelos-api-reviewer.yaml
@@ -50,6 +50,13 @@ spec:
         - event: issue_comment
           action: created
           bodyPattern: /kelos api-review
+          commentOn: Issue
+          state: open
+          author: gjkim42
+        - event: issue_comment
+          action: created
+          bodyPattern: /kelos api-review
+          commentOn: PullRequest
           state: open
           author: gjkim42
         - event: pull_request_review
diff --git a/self-development/kelos-planner.yaml b/self-development/kelos-planner.yaml
index fe0ecb1d3..2f5736953 100644
--- a/self-development/kelos-planner.yaml
+++ b/self-development/kelos-planner.yaml
@@ -36,6 +36,7 @@ spec:
         - event: issue_comment
           action: created
           bodyPattern: /kelos plan
+          commentOn: Issue
           state: open
           author: gjkim42
       reporting:
@@ -80,10 +81,6 @@ spec:
 
       ## Your tasks
 
-      ### 0. Confirm the target is an issue
-      If `gh pr view {{.Number}}` succeeds, this comment was posted on a pull request.
-      Exit without posting anything in that case.
-
       ### 1. Refresh issue context
       Re-read the latest issue state and all comments:
         `gh issue view {{.Number}} --comments`
diff --git a/self-development/kelos-reviewer.yaml b/self-development/kelos-reviewer.yaml
index 33330b87f..0ef1aa953 100644
--- a/self-development/kelos-reviewer.yaml
+++ b/self-development/kelos-reviewer.yaml
@@ -49,6 +49,7 @@ spec:
         - event: issue_comment
           action: created
           bodyPattern: /kelos review
+          commentOn: PullRequest
           state: open
           author: gjkim42
         - event: pull_request_review