diff --git a/.github/workflows/cherry-pick-master-to-v7.yml b/.github/workflows/cherry-pick-master-to-v7.yml
deleted file mode 100644
index e6e77684a7af..000000000000
--- a/.github/workflows/cherry-pick-master-to-v7.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Cherry pick master to v7
-
-on:
-  pull_request_target:
-    branches:
-      - master
-    types: ['closed']
-
-permissions: {}
-
-jobs:
-  cherry_pick_to_v7:
-    runs-on: ubuntu-latest
-    name: Cherry pick into v7
-    permissions:
-      pull-requests: write
-      contents: write
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-      - name: Cherry pick and create the new PR
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        uses: carloscastrojumo/github-cherry-pick-action@503773289f4a459069c832dc628826685b75b4b3 # v1.0.10
-        with:
-          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 }})'
-          labels: |
-            cherry-pick
diff --git a/.github/workflows/cherry-pick-v7-to-v6.yml b/.github/workflows/cherry-pick-v7-to-v6.yml
deleted file mode 100644
index 7bc0851b4846..000000000000
--- a/.github/workflows/cherry-pick-v7-to-v6.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Cherry pick v7 to v6
-
-on:
-  pull_request_target:
-    branches:
-      - v7.x
-    types: ['closed']
-
-permissions: {}
-
-jobs:
-  cherry_pick_v7_to_v6:
-    runs-on: ubuntu-latest
-    name: Cherry pick v7 into v6
-    permissions:
-      pull-requests: write
-      contents: write
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-      - name: Cherry pick and create the new PR
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        uses: carloscastrojumo/github-cherry-pick-action@503773289f4a459069c832dc628826685b75b4b3 # v1.0.10
-        with:
-          branch: v6.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 }})'
-          labels: |
-            cherry-pick
diff --git a/.github/workflows/create-cherry-pick-pr.yml b/.github/workflows/create-cherry-pick-pr.yml
new file mode 100644
index 000000000000..0d5381c25b9d
--- /dev/null
+++ b/.github/workflows/create-cherry-pick-pr.yml
@@ -0,0 +1,18 @@
+name: Create cherry-pick PR
+on:
+  pull_request_target:
+    branches:
+      - 'v*.x'
+      - 'master'
+    types: ['closed']
+
+permissions: {}
+
+jobs:
+  create_pr:
+    name: Create cherry-pick PR
+    uses: mui/mui-public/.github/workflows/prs_create-cherry-pick-pr.yml@master
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write