diff --git a/.woodpecker.yml b/.woodpecker.yml
index 1d6198c..0dba2ac 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -5,13 +5,17 @@
 ---
 variables:
   - &repo 'git.schmidl.dev/schtobia/buildimage'
+  - &registry 'git.schmidl.dev'
+  - &platforms 'linux/amd64, linux/arm64/v8'
+
 steps:
   docker-build:
     image: woodpeckerci/plugin-docker-buildx
     group: build
     settings:
       repo: *repo
-      registry: git.schmidl.dev
+      registry: *registry
+      platforms: *platforms
       dry_run: true
     when:
       branch:
@@ -20,18 +24,18 @@ steps:
 
   publish-next-agent:
     image: woodpeckerci/plugin-docker-buildx
-    group: publish
+    group: build
     secrets: [docker_username, docker_password]
     settings:
       repo: *repo
-      registry: git.schmidl.dev
-      dockerfile: dockerfile
-      platforms: linux/amd64,linux/arm64/v8
+      registry: *registry
+      platforms: *platforms
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
     when:
+      event: [push, tag]
       branch: master
-      event: push
+
 ...