diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 2b832d7..160988d 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -13,8 +13,8 @@ steps:
       repo: registry.mgrote.net/mdns-repeater-mikrotik
       registry: registry.mgrote.net
       tags:
-        - ${DRONE_COMMIT_SHA:0:8}
-        - ${DRONE_COMMIT_BRANCH}
+        - ${CI_COMMIT_SHA:0:8}
+        - ${CI_COMMIT_BRANCH}
         - latest
       platforms:
         - linux/arm64
@@ -33,10 +33,16 @@ steps:
       repo: registry.mgrote.net/mdns-repeater-mikrotik
       registry: registry.mgrote.net
       tags:
-        - ${DRONE_TAG}
+        - ${CI_COMMIT_TAG}
       platforms:
         - linux/arm64
         - linux/amd64
     when:
       event:
         - tag
+
+
+        - ${CI_COMMIT_TAG}
+        - ${CI_COMMIT_SHA:0:8}
+        - ${CI_COMMIT_BRANCH}
+        - latest