diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 61a5256..b63919c 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -1,39 +1,23 @@
 ---
 depends_on:
   - lint
+
+variables: # https://woodpecker-ci.org/docs/usage/advanced-usage
+  - &VERSION 'v1.0.${CI_PIPELINE_NUMBER}' # wird für die Docker-Tags verwendet
+
 steps:
   docker_build_and_push_selfhosted:
-    image: thegeeklab/drone-docker-buildx:24@sha256:0599efcb7d937a42f1664421f2c010252b49c34e56f76b5e4d0cb1cf2095ac89
+    image: "woodpeckerci/plugin-docker-buildx:3.0.1"
     privileged: true
     settings:
       dockerfile: Dockerfile
       repo: registry.mgrote.net/mdns-repeater-mikrotik
       registry: registry.mgrote.net
       tags:
+        - *VERSION
         - ${CI_COMMIT_SHA:0:8}
         - ${CI_COMMIT_BRANCH}
         - latest
       platforms:
         - linux/arm64
         - linux/amd64
-    when:
-      event:
-        exclude:
-          - pull_request
-          - tag
-
-  docker_build_and_push_selfhosted_tag:
-    image: thegeeklab/drone-docker-buildx:24@sha256:0599efcb7d937a42f1664421f2c010252b49c34e56f76b5e4d0cb1cf2095ac89
-    privileged: true
-    settings:
-      dockerfile: Dockerfile
-      repo: registry.mgrote.net/mdns-repeater-mikrotik
-      registry: registry.mgrote.net
-      tags:
-        - ${CI_COMMIT_TAG}
-      platforms:
-        - linux/arm64
-        - linux/amd64
-    when:
-      event:
-        - tag