diff --git a/.woodpecker.yml b/.woodpecker.yml
index 05dbdc3..a4843ad 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,11 +1,20 @@
 variables:
-    - &golang 'golang:1.20'
-    - &build_plugin 'woodpeckerci/plugin-docker-buildx:2'
-    - base_settings: &base_buildx_settings
-        platforms: 'linux/amd64,linux/arm64'
-        dockerfile: Dockerfile.multiarch
-        auto_tag: true
-        repo: woodpeckerci/plugin-docker-buildx,codeberg.org/woodpecker-plugins/docker-buildx
+  - &golang "golang:1.20"
+  - &build_plugin "woodpeckerci/plugin-docker-buildx:2"
+  - base_settings: &base_buildx_settings
+      platforms: "linux/amd64,linux/arm64"
+      dockerfile: Dockerfile.multiarch
+      auto_tag: true
+      auto_tag_suffix: "-${DOCKER_VERSION}"
+      build_args_from_env:
+        - DOCKER_VERSION
+      repo: woodpeckerci/plugin-docker-buildx,codeberg.org/woodpecker-plugins/docker-buildx
+
+matrix:
+  DOCKER_VERSION:
+    - 20.10
+    - 23.0
+    - 24.0
 
 steps:
   vendor:
diff --git a/Dockerfile.multiarch b/Dockerfile.multiarch
index a73cb13..634f083 100644
--- a/Dockerfile.multiarch
+++ b/Dockerfile.multiarch
@@ -1,6 +1,6 @@
 ARG BUILDX_VERSION=0.11.0
-ARG DOCKER_VERSION=20.10-dind
 ARG GOLANG_VERSION=1.20
+ARG DOCKER_VERSION
 
 FROM --platform=$BUILDPLATFORM golang:${GOLANG_VERSION} as build