diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index b8f28e8..a1c30f0 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -1,34 +1,8 @@
-matrix:
-  platform:
-    - linux/amd64
-    - linux/arm64
-
-labels:
-  platform: ${platform}
-
 when:
   - event: push
     branch: main
 
 steps:
-  - name: pacstrap_x86_64
-    image: git.hydrar.de/navos/navos:latest
-    privileged: true
-    commands:
-      - pacman -Syu --noconfirm && pacman -S --noconfirm navinstall && yes | pacman -Scc
-      - mkdir os-amd64 && navinstall create-tar os-amd64
-    when:
-      platform: linux/amd64
-
-  - name: pacstrap_aarch64
-    image: git.hydrar.de/navos/navos:latest
-    privileged: true
-    commands:
-      - pacman -Syu --noconfirm && pacman -S --noconfirm navinstall && yes | pacman -Scc
-      - mkdir os-arm64 && navinstall create-tar os-arm64
-    when:
-      platform: linux/arm64
-
   - name: build
     image: woodpeckerci/plugin-docker-buildx
     settings:
@@ -39,4 +13,3 @@ steps:
       username: jmarya
       password:
         from_secret: registry_token
-    depends_on: [pacstrap_aarch64, pacstrap_x86_64]
diff --git a/Dockerfile b/Dockerfile
index 71746d8..a704793 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,13 @@
-FROM scratch
 ARG TARGETARCH
-COPY ./os-${TARGETARCH}/ /
+FROM git.hydrar.de/navos/navos:latest
+# Download rootfs
+wget -O - "https://navos.hydrar.de/rootfs/${TARGETARCH}/rootfs.tar.xz" | tar --numeric-owner --xattrs --acls -xf - -C /os
+
+# Copy
+FROM scratch
+COPY --from=builder /os/ /
+
+# Update
+RUN pacman -Syu --noconfirm
+
 CMD ["/bin/sh"]
\ No newline at end of file
diff --git a/create_fs.sh b/create_fs.sh
new file mode 100644
index 0000000..394a43f
--- /dev/null
+++ b/create_fs.sh
@@ -0,0 +1,3 @@
+mkdir rootfs
+doas navinstall create-tar rootfs
+doas tar --numeric-owner --xattrs --acls -cpf rootfs.tar -C rootfs .
\ No newline at end of file