diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8b7f03d..72a7970 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,6 +14,9 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        docker-version: [28, 29]
     steps:
 
       - name: Checkout
@@ -33,6 +36,8 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
+          flavor: |
+            suffix=${{ matrix.docker-version != '29' && format('-docker-{0}', matrix.docker-version) || '' }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -55,3 +60,5 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            "DOCKER_IMAGE_TAG=${{ matrix.docker-version }}-cli"
diff --git a/Dockerfile b/Dockerfile
index ebca988..dc0350d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM docker:29.1.3-cli-alpine3.23
+ARG DOCKER_IMAGE_TAG=29-cli
+
+FROM docker:${DOCKER_IMAGE_TAG}
 
 LABEL maintainer="kitconcept GmbH <info@kitconcept.com>" \
       org.label-schema.name="docker-stack-deploy" \