diff --git a/.github/workflows/cherry-pick-next-to-master.yml b/.github/workflows/cherry-pick-master-to-v7.yml
similarity index 88%
rename from .github/workflows/cherry-pick-next-to-master.yml
rename to .github/workflows/cherry-pick-master-to-v7.yml
index 614c58330d3a3..6f980ac23c166 100644
--- a/.github/workflows/cherry-pick-next-to-master.yml
+++ b/.github/workflows/cherry-pick-master-to-v7.yml
@@ -1,17 +1,17 @@
-name: Cherry pick next to master
+name: Cherry pick master to v7
 
 on:
   pull_request_target:
     branches:
-      - next
+      - master
     types: ['closed']
 
 permissions: {}
 
 jobs:
-  cherry_pick_to_master:
+  cherry_pick_to_v7:
     runs-on: ubuntu-latest
-    name: Cherry pick into master
+    name: Cherry pick into v7
     permissions:
       pull-requests: write
       contents: write
@@ -26,7 +26,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         uses: carloscastrojumo/github-cherry-pick-action@503773289f4a459069c832dc628826685b75b4b3 # v1.0.10
         with:
-          branch: master
+          branch: v7.x
           body: 'Cherry-pick of #{old_pull_request_id}'
           cherry-pick-branch: ${{ format('cherry-pick-{0}', github.event.number) }}
           title: '{old_title} (@${{ github.event.pull_request.user.login }})'
diff --git a/.github/workflows/cherry-pick-master-to-v6.yml b/.github/workflows/cherry-pick-v7-to-v6.yml
similarity index 91%
rename from .github/workflows/cherry-pick-master-to-v6.yml
rename to .github/workflows/cherry-pick-v7-to-v6.yml
index 1b594e5b82004..f7e48ffe9fbea 100644
--- a/.github/workflows/cherry-pick-master-to-v6.yml
+++ b/.github/workflows/cherry-pick-v7-to-v6.yml
@@ -1,17 +1,17 @@
-name: Cherry pick master to v6
+name: Cherry pick v7 to v6
 
 on:
   pull_request_target:
     branches:
-      - master
+      - v7.x
     types: ['closed']
 
 permissions: {}
 
 jobs:
-  cherry_pick_to_v6:
+  cherry_pick_v7_to_v6:
     runs-on: ubuntu-latest
-    name: Cherry pick into v6
+    name: Cherry pick v7 into v6
     permissions:
       pull-requests: write
       contents: write