diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 30e4b2a..5924dc1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,15 +1,14 @@
 name: Release Docker image
 
-# Manual-only: pick a branch (or any ref - tag/SHA works too) and this builds the runtime image for
-# every platform in `platforms` and pushes it to Docker Hub as one multi-arch manifest per tag, so a
-# single tag serves x86_64 Linux/Windows-WSL2/Intel Mac and arm64 (Apple Silicon, Ampere) alike.
+# Manual-only: builds the runtime image for every platform in `platforms` and pushes it to Docker Hub
+# as one multi-arch manifest per tag, so a single tag serves x86_64 Linux/Windows-WSL2/Intel Mac and
+# arm64 (Apple Silicon, Ampere) alike.
+#
+# It always builds the branch it was dispatched from ("Use workflow from") - there is no ref input, so
+# there is no second branch to keep in sync with the one you picked.
 on:
     workflow_dispatch:
         inputs:
-            branch:
-                description: Branch (or tag/SHA) to build the image from
-                required: true
-                default: master
             image:
                 description: Docker Hub repository to push to
                 required: true
@@ -34,9 +33,9 @@ jobs:
         runs-on: ubuntu-latest
         timeout-minutes: 60
         steps:
+            # No `ref:` - checkout defaults to the commit the workflow was dispatched from, which is
+            # exactly the branch picked in "Use workflow from".
             - uses: actions/checkout@v4
-              with:
-                  ref: ${{ inputs.branch }}
 
             # Fail here rather than three slow build steps later, with the fix named.
             - name: Check Docker Hub credentials are configured
@@ -57,7 +56,7 @@ jobs:
               id: tags
               env:
                   IMAGE: ${{ inputs.image }}
-                  BRANCH: ${{ inputs.branch }}
+                  BRANCH: ${{ github.ref_name }}
                   EXTRA_TAG: ${{ inputs.extra_tag }}
                   LATEST: ${{ inputs.latest }}
               run: |
@@ -104,15 +103,18 @@ jobs:
                   tags: ${{ steps.tags.outputs.tags }}
                   provenance: mode=max
                   sbom: true
-                  # Keyed per platform set so a run for one platform list doesn't evict another's cache.
-                  cache-from: type=gha,scope=release-${{ inputs.platforms }}
-                  cache-to: type=gha,mode=max,scope=release-${{ inputs.platforms }}
+                  # One shared scope: a `type=gha` value is itself a comma-separated key=value list,
+                  # so interpolating the (comma-separated) platform list into `scope` would end the
+                  # value early and buildx would reject the leftover as a key. Sharing the scope also
+                  # lets a single-platform run reuse the layers a multi-arch run already cached.
+                  cache-from: type=gha,scope=release
+                  cache-to: type=gha,mode=max,scope=release
                   labels: |
                       org.opencontainers.image.title=actor-runtime
                       org.opencontainers.image.description=A minimal, self-contained local Apify platform in a single Docker image.
                       org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
                       org.opencontainers.image.revision=${{ steps.tags.outputs.revision }}
-                      org.opencontainers.image.version=${{ inputs.branch }}
+                      org.opencontainers.image.version=${{ github.ref_name }}
 
             - name: Summary
               env:
diff --git a/README.md b/README.md
index 955509c..86f3390 100644
--- a/README.md
+++ b/README.md
@@ -121,14 +121,16 @@ Images currently go to the temporary dev repository
 will move to an Apify-owned namespace later).
 
 The **Release Docker image** workflow (`.github/workflows/release.yml`) is manual only: Actions ->
-Release Docker image -> Run workflow, then pick the branch to build (plus, optionally, an extra tag
-such as `v0.1.0`, whether to also move `:latest`, and which platforms to build). It pushes one
-multi-arch manifest per tag - `linux/amd64` and `linux/arm64` by default - so the same tag serves
-x86_64 and Apple Silicon.
-
-Every run publishes `<branch>-<short-sha>` (immutable) and `<branch>` (moving). It needs two
-repository secrets: `DOCKERHUB_USERNAME` and `DOCKERHUB_TOKEN` (a Docker Hub access token with
-Read/Write from <https://hub.docker.com/settings/security>).
+Release Docker image -> Run workflow, pick the branch in **Use workflow from**, and run it. That is
+the only branch to choose - the workflow always builds the branch it was dispatched from. Everything
+else is optional: an extra tag such as `v0.1.0`, whether to also move `:latest`, and which platforms
+to build.
+
+It pushes one multi-arch manifest per tag - `linux/amd64` and `linux/arm64` by default - so the same
+tag serves x86_64 and Apple Silicon. Every run publishes `<branch>-<short-sha>` (immutable) and
+`<branch>` (moving), with `/` in a branch name slugified to `-`. It needs two repository secrets:
+`DOCKERHUB_USERNAME` and `DOCKERHUB_TOKEN` (a Docker Hub access token with Read/Write from
+<https://hub.docker.com/settings/security>).
 
 ## Development