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..ee579de 100755
--- a/build.sh
+++ b/build.sh
@@ -127,18 +127,19 @@ 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"
 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
 
-if [ -n "${QEMU+x}" ] && [ "$CROSS" -eq 1 ]; then
-	docker exec -t $1 bash -c "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"
 
+# if [ -n "${QEMU+x}" ] && [ "$CROSS" -eq 1 ]; then
+# 	docker exec -t $1 sudo bash -c "cd / && schroot -c source:$CHROOT -u root -- update-binfmts --enable $QEMU"
+# fi
+
+
 docker stop $1
 
 echo "export CHROOT=$CHROOT" > buildinfo
diff --git a/sbuild.sh b/sbuild.sh
index 4686278..7d0b7cc 100755
--- a/sbuild.sh
+++ b/sbuild.sh
@@ -29,4 +29,4 @@ if [ ! -z "$DIRECT" ]; then
 	echo $RESULT
 fi
 
-sbuild --chroot $CHROOT --host $HOST -j$JOBS --dpkg-source-opt="-I.git" "$@"
+sbuild --chroot $CHROOT --arch amd64 --target $HOST -j$JOBS --dpkg-source-opt="-I.git" "$@"