diff --git a/.woodpecker/docker.yml b/.woodpecker/docker.yml
index fc945410a..0590f03d7 100644
--- a/.woodpecker/docker.yml
+++ b/.woodpecker/docker.yml
@@ -74,7 +74,7 @@ pipeline:
       repo: woodpeckerci/woodpecker-server
       dockerfile: docker/Dockerfile.server.multiarch
       platforms: *platforms_server
-      tag: next
+      tag: [next, "next-${CI_COMMIT_SHA:0:10}"]
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
@@ -87,7 +87,7 @@ pipeline:
       repo: woodpeckerci/woodpecker-server
       dockerfile: docker/Dockerfile.server.alpine.multiarch
       platforms: *platforms_alpine
-      tag: next-alpine
+      tag: [next-alpine, "next-${CI_COMMIT_SHA:0:10}-alpine"]
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
@@ -168,7 +168,7 @@ pipeline:
       repo: woodpeckerci/woodpecker-agent
       dockerfile: docker/Dockerfile.agent.multiarch
       platforms: *platforms_release
-      tag: next
+      tag: [next, "next-${CI_COMMIT_SHA:0:10}"]
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
@@ -181,7 +181,7 @@ pipeline:
       repo: woodpeckerci/woodpecker-agent
       dockerfile: docker/Dockerfile.agent.alpine.multiarch
       platforms: *platforms_alpine
-      tag: next-alpine
+      tag: [next-alpine, "next-${CI_COMMIT_SHA:0:10}-alpine"]
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
@@ -262,7 +262,7 @@ pipeline:
       repo: woodpeckerci/woodpecker-cli
       dockerfile: docker/Dockerfile.cli.multiarch
       platforms: *platforms_release
-      tag: next
+      tag: [next, "next-${CI_COMMIT_SHA:0:10}"]
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
@@ -275,7 +275,7 @@ pipeline:
       repo: woodpeckerci/woodpecker-cli
       dockerfile: docker/Dockerfile.cli.alpine.multiarch
       platforms: *platforms_alpine
-      tag: next-alpine
+      tag: [next-alpine, "next-${CI_COMMIT_SHA:0:10}-alpine"]
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push