diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml
index b4cd2d71a3f88..37990320aa086 100644
--- a/.github/workflows/cherryPick.yml
+++ b/.github/workflows/cherryPick.yml
@@ -104,17 +104,17 @@ jobs:
 
           \`\`\`bash
           git fetch
-          git checkout roryabraham-cherry-pick-staging-56382-1
-          git cherry-pick -S -x --mainline 1 6486b1d1961d4c6de85154905d57af5118b33ff9
+          git checkout ${{ github.actor }}-cherry-pick-staging-${{ github.event.inputs.PULL_REQUEST_NUMBER }}-${{ github.run_attempt }}
+          git cherry-pick -S -x --mainline 1 ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}
           \`\`\`
 
           Then manually resolve conflicts, and commit the change with \`git cherry-pick --continue\`. Lastly, please run:
 
           \`\`\`bash
-          git commit --amend -m "\$(git log -1 --pretty=%B)" -m "(CP triggered by roryabraham)"
+          git commit --amend -m "\$(git log -1 --pretty=%B)" -m "(CP triggered by ${{ github.actor }})"
           \`\`\`
 
-          That will help us keep track of who triggered this CP. Once all that's done, push your changes with \`git push origin roryabraham-cherry-pick-staging-6486b1d1961d4c6de85154905d57af5118b33ff9-1\`, and then open this PR for review.
+          That will help us keep track of who triggered this CP. Once all that's done, push your changes with \`git push origin ${{ github.actor }}-cherry-pick-staging-${{ github.event.inputs.PULL_REQUEST_NUMBER }}-${{ github.run_attempt }}\`, and then open this PR for review.
 
           Note that you **must** test this PR, and both the author and reviewer checklist should be completed, just as if you were merging the PR to main.