diff --git a/.github/workflows/fork-sync-upstream.yml b/.github/workflows/fork-sync-upstream.yml
index cca603eac293..776c95c4f250 100644
--- a/.github/workflows/fork-sync-upstream.yml
+++ b/.github/workflows/fork-sync-upstream.yml
@@ -67,9 +67,10 @@ jobs:
         id: prep
         run: |
           set -euo pipefail
-          stamp="$(date -u +%Y%m%d-%H%M%S)"
           upstream_sha="$(git rev-parse --short "upstream/${UPSTREAM_BRANCH}")"
-          sync_branch="sync/${UPSTREAM_BRANCH}-${stamp}-${upstream_sha}"
+          safe_patch="$(echo "${PATCH_BRANCH}" | tr '/' '-')"
+          safe_upstream="$(echo "${UPSTREAM_BRANCH}" | tr '/' '-')"
+          sync_branch="sync/${safe_patch}-onto-${safe_upstream}"
           git checkout -B "$sync_branch" "origin/${PATCH_BRANCH}"
           echo "sync_branch=$sync_branch" >> "$GITHUB_OUTPUT"
           echo "upstream_sha=$upstream_sha" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/release-cli-fork.yml b/.github/workflows/release-cli-fork.yml
index 17752ce94bc5..29433fa77dd0 100644
--- a/.github/workflows/release-cli-fork.yml
+++ b/.github/workflows/release-cli-fork.yml
@@ -28,7 +28,12 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Bun
-        uses: ./.github/actions/setup-bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: "1.3.9"
+
+      - name: Install dependencies
+        run: bun install
 
       - name: Resolve tag and version
         id: meta