diff --git a/.github/workflows/ci-pulsarbot.yaml b/.github/workflows/ci-pulsarbot.yaml
index 1f0b6d42f210f..5d3594baf3afe 100644
--- a/.github/workflows/ci-pulsarbot.yaml
+++ b/.github/workflows/ci-pulsarbot.yaml
@@ -41,6 +41,30 @@ jobs:
 
       - name: Execute pulsarbot command
         id:   pulsarbot
+        if: github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '/pulsarbot')
         env:
           GITHUB_TOKEN: ${{ secrets.PULSARBOT_TOKEN }}
         uses: apache/pulsar-test-infra/pulsarbot@master
+
+      # Just use a github user who has permission to create a branch on the apache/pulsar repo.
+      # We can consider creating a bot user to do this.
+      - name: Cherry-pick prompt
+        if: github.event_name == 'pull_request' && github.event.pull_request.merged == true
+        uses: apache/pulsar-test-infra/cherry-pick@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.PULSARBOT_TOKEN }}
+        with:
+          type: prompt-comment
+          github_user: codelipenghui
+          github_email: 'penghui@apache.org'
+          github_repos: 'apache/pulsar'
+
+      - name: Cherry-pick
+        if: github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '/pulsarbot cherry-pick')
+        uses: apache/pulsar-test-infra/cherry-pick@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.PULSARBOT_TOKEN }}
+        with:
+          github_user: codelipenghui
+          github_email: 'penghui@apache.org'
+          github_repos: 'apache/pulsar'