diff --git a/.woodpecker/docker.yml b/.woodpecker/docker.yml
index 8eaa722b2..4a2e26ece 100644
--- a/.woodpecker/docker.yml
+++ b/.woodpecker/docker.yml
@@ -35,27 +35,27 @@ pipeline:
       TAGS: bindata sqlite sqlite_unlock_notify
       XGO_VERSION: *xgo_version
 
-  publish-server-dryrun:
+  publish-server-preview:
     image: woodpeckerci/plugin-docker-buildx
+    secrets: [ docker_username, docker_password ]
     group: docker
     settings:
-      dry_run: true
       repo: woodpeckerci/woodpecker-server
       dockerfile: docker/Dockerfile.server.multiarch
       platforms: linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le
-      tag: test
+      tag: pull_${CI_COMMIT_PULL_REQUEST}
     when:
       event: pull_request
 
-  publish-server-alpine-dryrun:
+  publish-server-alpine-preview:
     image: woodpeckerci/plugin-docker-buildx
+    secrets: [ docker_username, docker_password ]
     group: docker
     settings:
-      dry_run: true
       repo: woodpeckerci/woodpecker-server
       dockerfile: docker/Dockerfile.server.alpine.multiarch
       platforms: linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le
-      tag: next-alpine
+      tag: pull_${CI_COMMIT_PULL_REQUEST}-alpine
     when:
       event: pull_request
 
@@ -141,15 +141,15 @@ pipeline:
   # A g e n t #
   #############
 
-  publish-agent-dryrun:
+  publish-agent-preview:
     group: docker
     image: woodpeckerci/plugin-docker-buildx
+    secrets: [ docker_username, docker_password ]
     settings:
-      dry_run: true
       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
-      tag: test
+      tag: pull_${CI_COMMIT_PULL_REQUEST}
     when:
       event: pull_request
 
@@ -235,15 +235,15 @@ pipeline:
   # C L I #
   #########
 
-  publish-cli-dryrun:
+  publish-cli-preview:
     group: docker
     image: woodpeckerci/plugin-docker-buildx
+    secrets: [ docker_username, docker_password ]
     settings:
-      dry_run: true
       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
-      tag: test
+      tag: pull_${CI_COMMIT_PULL_REQUEST}
     when:
       event: pull_request
 
diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml
index 36877131e..fcbd9a656 100644
--- a/.woodpecker/test.yml
+++ b/.woodpecker/test.yml
@@ -12,6 +12,14 @@ variables:
       - "pipeline/schema/**"
 
 pipeline:
+  vendor:
+    image: *golang_image
+    group: prepare
+    commands:
+      - go mod vendor
+    when:
+      path: *when_path
+
   lint-pipeline:
     image: *golang_image
     commands:
@@ -21,14 +29,6 @@ pipeline:
         - ".woodpecker/**"
         - "pipeline/schema/**"
 
-  vendor:
-    image: *golang_image
-    group: prepare
-    commands:
-      - go mod vendor
-    when:
-      path: *when_path
-
   dummy-web:
     image: *golang_image
     group: prepare