diff --git a/.woodpecker/10-build-main.yml b/.woodpecker/10-build-dev.yml
similarity index 100%
rename from .woodpecker/10-build-main.yml
rename to .woodpecker/10-build-dev.yml
diff --git a/.woodpecker/20-build-tag.yml b/.woodpecker/20-build-tag.yml
new file mode 100644
index 0000000..f94e6f4
--- /dev/null
+++ b/.woodpecker/20-build-tag.yml
@@ -0,0 +1,41 @@
+steps:
+  - name: prod/build-binary/linux-amd64
+    image: golang:1.24.2
+    environment:
+      GOOS: "linux"
+      GOARCH: "amd64"
+      I_PACKAGE: "git.hackmi.ch/Phil/goshorly/utils"
+      CGO_ENABLED: 0
+    commands:
+      - go build -a -installsuffix cgo -ldflags=" -X $I_PACKAGE.CI_COMMIT_SHA=$CI_COMMIT_SHA -X $I_PACKAGE.CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH -X $I_PACKAGE.CI_COMMIT_TAG=$CI_COMMIT_TAG" -o app-linux-amd64 .
+
+  - name: prod/build-binary/linux-arm64
+    image: golang:1.24.2
+    environment:
+      GOOS: "linux"
+      GOARCH: "arm64"
+      I_PACKAGE: "git.hackmi.ch/Phil/goshorly/utils"
+      CGO_ENABLED: 0
+    commands:
+      - go build -a -installsuffix cgo -ldflags=" -X $I_PACKAGE.CI_COMMIT_SHA=$CI_COMMIT_SHA -X $I_PACKAGE.CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH -X $I_PACKAGE.CI_COMMIT_TAG=$CI_COMMIT_TAG" -o app-linux-arm64 .
+
+  - name: prod/build-docker/linux-multiarch
+    image: woodpeckerci/plugin-docker-buildx:5.2.2
+    settings:
+      platforms: linux/amd64,linux/arm64
+      repo: git.hackmi.ch/phil/goshorly
+      registry: git.hackmi.ch
+      auto_tag: true
+      username:
+        from_secret: reg-user
+      password:
+        from_secret: reg-pass
+    depends_on:
+      - prod/build-binary/linux-amd64
+      - prod/build-binary/linux-arm64
+      
+when:
+  - event: tag
+
+depends_on:
+  - 0-pre
\ No newline at end of file