diff --git a/.github/workflows/docker-publish-rootfs.yaml b/.github/workflows/docker-publish-rootfs.yaml
index 1faa68a..ae0ccee 100644
--- a/.github/workflows/docker-publish-rootfs.yaml
+++ b/.github/workflows/docker-publish-rootfs.yaml
@@ -14,18 +14,6 @@ jobs:
       matrix:
         target:
           [
-            xenial_x64,
-            xenial_arm64,
-            xenial_armhf,
-            bionic_x64,
-            bionic_arm64,
-            bionic_armhf,
-            focal_x64,
-            focal_arm64,
-            focal_armhf,
-            jammy_x64,
-            jammy_arm64,
-            jammy_armhf,
             noble_x64,
             noble_arm64,
             noble_armhf,
diff --git a/build.sh b/build.sh
index 01b1095..60d3434 100755
--- a/build.sh
+++ b/build.sh
@@ -127,17 +127,18 @@ esac
 
 if [ "$CROSS" -eq 1 ]
 then
-	docker exec -t $1 bash -c "mk-sbuild --target $HOST $DIST && sudo sed -i 's/^union-type=.*/union-type=overlay/' /etc/schroot/chroot.d/sbuild-$CHROOT && sbuild-update $CHROOT && sbuild-upgrade $CHROOT && sudo cp /usr/bin/qemu-a*-static /var/lib/schroot/chroots/$CHROOT/usr/bin"
+	docker exec -t $1 bash -c "mk-sbuild --arch amd64 --target $HOST $DIST && sudo sed -i 's/^union-type=.*/union-type=overlay/' /etc/schroot/chroot.d/sbuild-$CHROOT && sbuild-update $CHROOT && sbuild-upgrade $CHROOT && sudo cp /usr/bin/qemu-a*-static /var/lib/schroot/chroots/$CHROOT/usr/bin  && sudo cp /usr/sbin/update-binfmts /var/lib/schroot/chroots/$CHROOT/usr/sbin"
 else
 	docker exec -t $1 bash -c "mk-sbuild --arch $HOST $DIST && sudo sed -i 's/^union-type=.*/union-type=overlay/' /etc/schroot/chroot.d/sbuild-$CHROOT && sbuild-update $CHROOT && sbuild-upgrade $CHROOT"
 fi
 
+# Install essential packages
+docker exec -t $1 sudo bash -c "cd / && schroot -c source:$CHROOT -u root -- apt-get install -y apt-transport-https ca-certificates"
+
 if [ -n "${QEMU+x}" ] && [ "$CROSS" -eq 1 ]; then
-	docker exec -t $1 bash -c "update-binfmts --enable $QEMU"
+	docker exec -t $1 sudo bash -c "cd / && schroot -c source:$CHROOT -u root -- update-binfmts --enable $QEMU"
 fi
 
-# Install essential packages
-docker exec -t $1 sudo bash -c "cd / && schroot -c source:$CHROOT -u root -- apt-get install -y apt-transport-https ca-certificates"
 
 docker stop $1