diff --git a/.woodpecker/3-build-tagged.yml b/.woodpecker/3-build-tagged.yml
new file mode 100644
index 0000000..5bf75c9
--- /dev/null
+++ b/.woodpecker/3-build-tagged.yml
@@ -0,0 +1,34 @@
+steps:
+  - name: build-docker-tg-linux-amd64/arm64/armv6
+    image: woodpeckerci/plugin-docker-buildx:3
+    environment:
+      - DOCKER_HOST=tcp://docker:2376
+    settings:
+      platforms: linux/amd64,linux/arm/v6,linux/arm64/v8
+      repo: git.hackmi.ch/phil/goshorly
+      registry: git.hackmi.ch
+      tags: ${CI_COMMIT_TAG}
+      username:
+        from_secret: reg-user
+      password:
+        from_secret: reg-pass
+      build_args:
+        - CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
+        - CI_COMMIT_SHORT_SHA=${CI_COMMIT_SHA:0:10}
+        - CI_COMMIT_TAG=${CI_COMMIT_TAG}
+    depends_on:
+      - build-binary-UT-lin/amd64
+    when:
+      - event: tag
+
+services:
+  docker:
+    image: docker:24-dind
+    commands:
+      - dockerd --tls=false --host=tcp://0.0.0.0:2376
+    privileged: true
+    when:
+      - event: tag
+
+depends_on:
+  - 1-check
\ No newline at end of file