diff --git a/.woodpecker.yml b/.woodpecker.yml
index 12ce43d..60f613b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -26,17 +26,7 @@ steps:
       prefix_regex:	"(#|//) (TODO|FIXME): "
       debug: false
 
-  build:
-    when:
-      - event: push
-        branch: main
-      - event: tag
-        ref: refs/tags/v*
-    image: git.kemitix.net/kemitix/kxio-builder:latest
-    environment:
-      CARGO_TERM_COLOR: always
-
-  lint:
+  lint_and_build:
     when:
       - event: push
         branch: main
@@ -49,6 +39,7 @@ steps:
       - ls -l /usr/local/cargo/bin/
       - cargo fmt --all -- --check
       - cargo clippy -- -D warnings -W clippy::nursery -W clippy::unwrap_used -W clippy::expect_used
+      - cargo build
 
   test:
     when: