diff --git a/.woodpecker/docker.yml b/.woodpecker/docker.yml
index 41c36675f..7810f38d9 100644
--- a/.woodpecker/docker.yml
+++ b/.woodpecker/docker.yml
@@ -44,7 +44,7 @@ pipeline:
     when:
       event: pull_request
 
-  publish-server:
+  publish-next-server:
     image: plugins/docker
     group: docker
     secrets: [docker_username, docker_password]
@@ -56,7 +56,7 @@ pipeline:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
 
-  publish-server-alpine:
+  publish-next-server-alpine:
     image: plugins/docker
     group: docker
     secrets: [ docker_username, docker_password ]
@@ -68,6 +68,30 @@ pipeline:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
 
+  publish-release-branch-server:
+    image: plugins/docker
+    group: docker
+    secrets: [docker_username, docker_password]
+    settings:
+      repo: woodpeckerci/woodpecker-server
+      dockerfile: docker/Dockerfile.server
+      tag: ${CI_COMMIT_BRANCH##release/}
+    when:
+      branch: release/*
+      event: push
+
+  publish-release-branch-server-alpine:
+    image: plugins/docker
+    group: docker
+    secrets: [ docker_username, docker_password ]
+    settings:
+      repo: woodpeckerci/woodpecker-server
+      dockerfile: docker/Dockerfile.server.alpine
+      tag: ${CI_COMMIT_BRANCH##release/}
+    when:
+      branch: release/*
+      event: push
+
   release-server:
     group: docker
     image: plugins/docker
@@ -75,6 +99,7 @@ pipeline:
     settings:
       repo: woodpeckerci/woodpecker-server
       dockerfile: docker/Dockerfile.server
+      # remove 'latest' on older version branches to avoid accidental downgrade
       tag: [latest, "${CI_COMMIT_TAG}"]
     when:
       event: tag
@@ -86,6 +111,7 @@ pipeline:
     settings:
       repo: woodpeckerci/woodpecker-server
       dockerfile: docker/Dockerfile.server.alpine
+      # remove 'latest-alpine' on older version branches to avoid accidental downgrade
       tag: [latest-alpine, "${CI_COMMIT_TAG}-alpine"]
     when:
       event: tag
@@ -106,7 +132,7 @@ pipeline:
     when:
       event: pull_request
 
-  publish-agent:
+  publish-next-agent:
     group: docker
     image: woodpeckerci/plugin-docker-buildx
     secrets: [docker_username, docker_password]
@@ -119,7 +145,7 @@ pipeline:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
 
-  publish-agent-alpine:
+  publish-next-agent-alpine:
     group: docker
     image: woodpeckerci/plugin-docker-buildx
     secrets: [ docker_username, docker_password ]
@@ -132,6 +158,32 @@ pipeline:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
 
+  publish-release-branch-agent:
+    group: docker
+    image: woodpeckerci/plugin-docker-buildx
+    secrets: [docker_username, docker_password]
+    settings:
+      repo: woodpeckerci/woodpecker-agent
+      dockerfile: docker/Dockerfile.agent.multiarch
+      platforms: linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,windows/amd64,darwin/amd64,darwin/arm64,freebsd/arm64,freebsd/amd64,openbsd/arm64,openbsd/amd64
+      tag: ${CI_COMMIT_BRANCH##release/}
+    when:
+      branch: release/*
+      event: push
+
+  publish-release-branch-agent-alpine:
+    group: docker
+    image: woodpeckerci/plugin-docker-buildx
+    secrets: [ docker_username, docker_password ]
+    settings:
+      repo: woodpeckerci/woodpecker-agent
+      dockerfile: docker/Dockerfile.agent.alpine.multiarch
+      platforms: linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le
+      tag: ${CI_COMMIT_BRANCH##release/}
+    when:
+      branch: release/*
+      event: push
+
   release-agent:
     group: docker
     image: woodpeckerci/plugin-docker-buildx
@@ -140,6 +192,7 @@ pipeline:
       repo: woodpeckerci/woodpecker-agent
       dockerfile: docker/Dockerfile.agent.multiarch
       platforms: linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,windows/amd64,darwin/amd64,darwin/arm64,freebsd/arm64,freebsd/amd64,openbsd/arm64,openbsd/amd64
+      # remove 'latest' on older version branches to avoid accidental downgrade
       tag: [latest, "${CI_COMMIT_TAG}"]
     when:
       event: tag
@@ -152,6 +205,7 @@ pipeline:
       repo: woodpeckerci/woodpecker-agent
       dockerfile: docker/Dockerfile.agent.alpine.multiarch
       platforms: linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le
+      # remove 'latest-alpine' on older version branches to avoid accidental downgrade
       tag: [latest-alpine, "${CI_COMMIT_TAG}-alpine"]
     when:
       event: tag
@@ -172,7 +226,7 @@ pipeline:
     when:
       event: pull_request
 
-  publish-cli:
+  publish-next-cli:
     group: docker
     image: woodpeckerci/plugin-docker-buildx
     secrets: [docker_username, docker_password]
@@ -185,7 +239,7 @@ pipeline:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
 
-  publish-cli-alpine:
+  publish-next-cli-alpine:
     group: docker
     image: woodpeckerci/plugin-docker-buildx
     secrets: [ docker_username, docker_password ]
@@ -198,6 +252,32 @@ pipeline:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
 
+  publish-release-branch-cli:
+    group: docker
+    image: woodpeckerci/plugin-docker-buildx
+    secrets: [docker_username, docker_password]
+    settings:
+      repo: woodpeckerci/woodpecker-cli
+      dockerfile: docker/Dockerfile.cli.multiarch
+      platforms: linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,windows/amd64,darwin/amd64,darwin/arm64,freebsd/arm64,freebsd/amd64,openbsd/arm64,openbsd/amd64
+      tag: ${CI_COMMIT_BRANCH##release/}
+    when:
+      branch: release/*
+      event: push
+
+  publish-release-branch-cli-alpine:
+    group: docker
+    image: woodpeckerci/plugin-docker-buildx
+    secrets: [ docker_username, docker_password ]
+    settings:
+      repo: woodpeckerci/woodpecker-cli
+      dockerfile: docker/Dockerfile.cli.alpine.multiarch
+      platforms: linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le
+      tag: ${CI_COMMIT_BRANCH##release/}
+    when:
+      branch: release/*
+      event: push
+
   release-cli:
     group: docker
     image: woodpeckerci/plugin-docker-buildx
@@ -206,6 +286,7 @@ pipeline:
       repo: woodpeckerci/woodpecker-cli
       dockerfile: docker/Dockerfile.cli.multiarch
       platforms: linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,windows/amd64,darwin/amd64,darwin/arm64,freebsd/arm64,freebsd/amd64,openbsd/arm64,openbsd/amd64
+      # remove 'latest' on older version branches to avoid accidental downgrade
       tag: [latest, "${CI_COMMIT_TAG}"]
     when:
       event: tag
@@ -218,6 +299,7 @@ pipeline:
       repo: woodpeckerci/woodpecker-cli
       dockerfile: docker/Dockerfile.cli.alpine.multiarch
       platforms: linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le
+      # remove 'latest-alpine' on older version branches to avoid accidental downgrade
       tag: [latest-alpine, "${CI_COMMIT_TAG}-alpine"]
     when:
       event: tag