diff --git a/.woodpecker.yml b/.woodpecker.yml
index adce5b8..d82b7c8 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -18,11 +18,22 @@ pipeline:
       - golangci-lint run --timeout 5m --build-tags integration
 
   build:
+    group: compliant
+    image: a6543/golang_just
+    commands:
+      - go version
+      - just build
+    when:
+      event: [ "pull_request", "push" ]
+
+  build-tag:
     group: compliant
     image: a6543/golang_just
     commands:
       - go version
       - just build-tag ${CI_COMMIT_TAG##v}
+    when:
+      event: [ "tag" ]
 
   test:
     image: a6543/golang_just
@@ -39,4 +50,4 @@ pipeline:
       - ACME_API=https://acme.mock.directory
       - PAGES_DOMAIN=localhost.mock.directory
       - RAW_DOMAIN=raw.localhost.mock.directory
-      - PORT=4430
\ No newline at end of file
+      - PORT=4430