diff --git a/debian/changelog b/debian/changelog
index d036c0aa..1e798a7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 livecd-rootfs (2.664.31) UNRELEASED; urgency=medium
 
+  [ Łukasz 'sil2100' Zemczak ]
   * Add the 099-ubuntu-image-customization.chroot for
     desktop-preinstalled images similar to what we have in groovy+ (for the pi
     desktop), but improved for amd64 platforms. We need it to generate a valid
     grub.cfg on the rootfs (similar to ubuntu-cpc) and then use that instead
     of a static configuration locked on the boot partition (LP: #1949102).
 
+  [ Brian Murray ]
+  * Properly check ARCH when setting the intel-iot model.
+
  -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 28 Oct 2021 17:35:12 +0200
 
 livecd-rootfs (2.664.30) focal; urgency=medium
diff --git a/live-build/auto/config b/live-build/auto/config
index 001dfb75..b3fa80c1 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -835,7 +835,7 @@ case $PROJECT in
 			arm64)
 				add_package install flash-kernel
 				;;
-			amd64)
+			amd64*)
 				if [ "${SUBARCH:-}" = "intel-iot" ]; then
 					KERNEL_FLAVOURS=image-intel
 					COMPONENTS='main restricted universe'