diff --git a/live-build/buildd/hooks/02-disk-image-uefi.binary b/live-build/buildd/hooks/02-disk-image-uefi.binary
index b3290e09..75d93aa5 100755
--- a/live-build/buildd/hooks/02-disk-image-uefi.binary
+++ b/live-build/buildd/hooks/02-disk-image-uefi.binary
@@ -1,7 +1,7 @@
 #!/bin/bash -eux
 
 case $ARCH in
-    amd64|arm64|armhf)
+    amd64)
         ;;
     *)
         echo "We don't create EFI images for $ARCH."
diff --git a/live-build/buildd/hooks/52-linux-virtual-image.binary b/live-build/buildd/hooks/52-linux-virtual-image.binary
index f373136b..a0c64d75 100755
--- a/live-build/buildd/hooks/52-linux-virtual-image.binary
+++ b/live-build/buildd/hooks/52-linux-virtual-image.binary
@@ -4,6 +4,15 @@
 # Generate linux-virtual image
 #
 
+case $ARCH in
+    amd64)
+        ;;
+    *)
+        echo "We don't build bootable Buildd images for $ARCH."
+        exit 0
+        ;;
+esac
+
 echo "Building bootable Buildd image"
 
 IMAGE_STR="# BUILDD_IMG: This file was created/modified by the Buildd Image build process"