diff --git a/.woodpecker/main.yml b/.woodpecker/main.yml
index 03b6f4940..666a509a1 100644
--- a/.woodpecker/main.yml
+++ b/.woodpecker/main.yml
@@ -43,8 +43,7 @@ pipeline:
     settings:
       repo: woodpeckerci/woodpecker-server
       dockerfile: docker/Dockerfile.server
-      # TODO: only release as next after 0.15.0 got released
-      tag: [next, latest]
+      tag: next
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
@@ -56,8 +55,7 @@ pipeline:
     settings:
       repo: woodpeckerci/woodpecker-server
       dockerfile: docker/Dockerfile.server.alpine
-      # TODO: only release as next-alpine after 0.15.0 got released
-      tag: [next-alpine, latest-alpine]
+      tag: next-alpine
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
@@ -82,8 +80,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
-      # TODO: only release as next after 0.15.0 got released
-      tag: [next, latest]
+      tag: next
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
@@ -96,8 +93,7 @@ pipeline:
       repo: woodpeckerci/woodpecker-agent
       dockerfile: docker/Dockerfile.agent.alpine.multiarch
       platforms: linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le
-      # TODO: only release as next-alpine after 0.15.0 got released
-      tag: [next-alpine, latest-alpine]
+      tag: next-alpine
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
       event: push
diff --git a/docs/docs/80-downloads.md b/docs/docs/80-downloads.md
index f5fa810fe..efbe9d330 100644
--- a/docs/docs/80-downloads.md
+++ b/docs/docs/80-downloads.md
@@ -7,9 +7,10 @@
 ## Docker images
 
 Image variants:
-* The `next` images are based on the current master branch
-* The `latest` is same as next (will change after v0.15.0 release to be latest stable release)
-* The `x.x.x` version images are stable releases
+* The `latest` image is the latest stable release
+* The `vX.X.X` version images are stable releases
+* The `vX.X` images are based on version specific release branche, they have the latest bugfixes backported
+* The `next` images are based on the current master branch and should not be used for production environments
 
 ``` bash
 # server