diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index a1c30f0..095bf10 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -3,6 +3,12 @@ when:
     branch: main
 
 steps:
+  - name: pacstrap
+    image: git.hydrar.de/navos/navos:latest
+    privileged: true
+    commands:
+      - pacman -Syu --noconfirm && pacman -S --noconfirm navinstall && yes | pacman -Scc
+      - mkdir os && navinstall create-tar os
   - name: build
     image: woodpeckerci/plugin-docker-buildx
     settings:
diff --git a/Dockerfile b/Dockerfile
index faa66b6..f37998e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,3 @@
-FROM  git.hydrar.de/navos/navos:latest AS builder
-
-COPY ./pacman.conf /pacman.conf
-RUN pacman -Syu --noconfirm && pacman -S --noconfirm navinstall && yes | pacman -Scc
-
-RUN mkdir /os && navinstall create-tar /os
-
 FROM scratch
-COPY --from=builder /os/ /
+COPY --from=builder ./os/ /
 CMD ["/bin/sh"]
\ No newline at end of file