diff --git a/.github/workflows/build-docker-cli.yml b/.github/workflows/build-docker-cli.yml
deleted file mode 100644
index 332f883f..00000000
--- a/.github/workflows/build-docker-cli.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: build-docker-cli
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-on:
-  push:
-    branches:
-      - 'main'
-      - 'docker/[0-9]+.[0-9]+'
-    paths:
-      - '.github/workflows/.build.yml'
-      - '.github/workflows/build-docker-cli.yml'
-      - 'hack/scripts/**'
-      - 'pkg/docker-cli/**'
-      - 'docker-bake.hcl'
-  pull_request:
-    branches:
-      - 'main'
-      - 'docker/[0-9]+.[0-9]+'
-    paths:
-      - '.github/workflows/.build.yml'
-      - '.github/workflows/build-docker-cli.yml'
-      - 'hack/scripts/**'
-      - 'pkg/docker-cli/**'
-      - 'docker-bake.hcl'
-
-jobs:
-  run:
-    uses: ./.github/workflows/.build.yml
-    permissions:
-      contents: read
-    with:
-      name: docker-cli
diff --git a/.github/workflows/build-docker-engine.yml b/.github/workflows/build-docker.yml
similarity index 69%
rename from .github/workflows/build-docker-engine.yml
rename to .github/workflows/build-docker.yml
index 2e9a6588..9e18ab3c 100644
--- a/.github/workflows/build-docker-engine.yml
+++ b/.github/workflows/build-docker.yml
@@ -1,4 +1,4 @@
-name: build-docker-engine
+name: build-docker
 
 permissions:
   contents: read
@@ -14,9 +14,10 @@ on:
       - 'docker/[0-9]+.[0-9]+'
     paths:
       - '.github/workflows/.build.yml'
-      - '.github/workflows/build-docker-engine.yml'
+      - '.github/workflows/build-docker.yml'
       - 'hack/scripts/**'
       - 'pkg/docker-engine/**'
+      - 'pkg/docker-cli/**'
       - 'docker-bake.hcl'
   pull_request:
     branches:
@@ -24,15 +25,23 @@ on:
       - 'docker/[0-9]+.[0-9]+'
     paths:
       - '.github/workflows/.build.yml'
-      - '.github/workflows/build-docker-engine.yml'
+      - '.github/workflows/build-docker.yml'
       - 'hack/scripts/**'
       - 'pkg/docker-engine/**'
+      - 'pkg/docker-cli/**'
       - 'docker-bake.hcl'
 
 jobs:
-  run:
+  engine:
     uses: ./.github/workflows/.build.yml
     permissions:
       contents: read
     with:
       name: docker-engine
+
+  cli:
+    uses: ./.github/workflows/.build.yml
+    permissions:
+      contents: read
+    with:
+      name: docker-cli
diff --git a/.github/workflows/release-docker-cli.yml b/.github/workflows/release-docker-cli.yml
deleted file mode 100644
index b2506a01..00000000
--- a/.github/workflows/release-docker-cli.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: release-docker-cli
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-on:
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: 'Tag/ref to build (e.g. v23.0.0)'
-        required: true
-        type: string
-      release:
-        description: '(optional) Release type to create in https://github.com/docker/packaging/releases'
-        required: false
-        default: 'release'
-        type: choice
-        options:
-          - pushonly
-          - draft
-          - prerelease
-          - release
-      distros:
-        description: '(optional, empty = all supported) Distros to build (comma-separated, e.g. "debian12,ubuntu2204")'
-        required: false
-        type: string
-        default: ''
-      revision:
-        description: |
-          Revision of the package to build. Only in case we ever would have to re-build an already published release with a packaging-only change.
-          Default for a tagged/upstream release is 1.
-        required: false
-        type: string
-        default: ''
-      repo:
-        description: '(optional) Override default repo (if want to build from a different Github repo/fork)'
-        required: false
-        type: string
-
-jobs:
-  release:
-    uses: ./.github/workflows/.build.yml
-    permissions:
-      contents: write # needed to create release and upload artifacts
-    with:
-      name: docker-cli
-      release: ${{ inputs.release }}
-      distros: ${{ inputs.distros }}
-      envs: |
-        PKG_REPO=${{ inputs.repo }}
-        PKG_REF=${{ inputs.ref }}
-        PKG_DEB_REVISION=${{ inputs.revision }}
-        PKG_RPM_RELEASE=${{ inputs.revision }}
-    secrets:
-      rh_user: ${{ secrets.RH_USER }}
-      rh_pass: ${{ secrets.RH_PASS }}
-      dockerpublicbot_username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
-      dockerpublicbot_write_pat: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
diff --git a/.github/workflows/release-docker-engine.yml b/.github/workflows/release-docker.yml
similarity index 52%
rename from .github/workflows/release-docker-engine.yml
rename to .github/workflows/release-docker.yml
index 0ca1b5f4..81caa02e 100644
--- a/.github/workflows/release-docker-engine.yml
+++ b/.github/workflows/release-docker.yml
@@ -1,4 +1,4 @@
-name: release-docker-engine
+name: release-docker
 
 permissions:
   contents: read
@@ -10,8 +10,16 @@ concurrency:
 on:
   workflow_dispatch:
     inputs:
-      ref:
-        description: 'Tag/ref to build (e.g. v23.0.0)'
+      engine-ref:
+        description: 'Git ref for docker-engine (e.g. v28.1.0, master, a commit SHA)'
+        required: true
+        type: string
+      cli-ref:
+        description: 'Git ref for docker-cli (e.g. v28.1.0, master, a commit SHA)'
+        required: true
+        type: string
+      version:
+        description: 'Docker version (used for both engine and cli, e.g. 28.1.0)'
         required: true
         type: string
       release:
@@ -36,13 +44,17 @@ on:
         required: false
         type: string
         default: ''
-      repo:
-        description: '(optional) Override default repo (if want to build from a different Github repo/fork)'
+      engine-repo:
+        description: '(optional) Override default engine repo (if want to build from a different Github repo/fork)'
+        required: false
+        type: string
+      cli-repo:
+        description: '(optional) Override default cli repo (if want to build from a different Github repo/fork)'
         required: false
         type: string
 
 jobs:
-  release:
+  engine:
     uses: ./.github/workflows/.build.yml
     permissions:
       contents: write # needed to create release and upload artifacts
@@ -51,8 +63,27 @@ jobs:
       release: ${{ inputs.release }}
       distros: ${{ inputs.distros }}
       envs: |
-        PKG_REPO=${{ inputs.repo }}
-        PKG_REF=${{ inputs.ref }}
+        PKG_REPO=${{ inputs.engine-repo }}
+        PKG_REF=${{ inputs.engine-ref }}
+        PKG_DEB_REVISION=${{ inputs.revision }}
+        PKG_RPM_RELEASE=${{ inputs.revision }}
+    secrets:
+      rh_user: ${{ secrets.RH_USER }}
+      rh_pass: ${{ secrets.RH_PASS }}
+      dockerpublicbot_username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
+      dockerpublicbot_write_pat: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
+
+  cli:
+    uses: ./.github/workflows/.build.yml
+    permissions:
+      contents: write # needed to create release and upload artifacts
+    with:
+      name: docker-cli
+      release: ${{ inputs.release }}
+      distros: ${{ inputs.distros }}
+      envs: |
+        PKG_REPO=${{ inputs.cli-repo }}
+        PKG_REF=${{ inputs.cli-ref }}
         PKG_DEB_REVISION=${{ inputs.revision }}
         PKG_RPM_RELEASE=${{ inputs.revision }}
     secrets: