diff --git a/debian/changelog b/debian/changelog
index 63baa1aa..75439c9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.634) focal; urgency=medium
+
+  * Only build bootable buildd images for amd64.
+  * Properly setup the chroot before using the network.
+
+ -- David Krauser <david.krauser@canonical.com>  Thu, 12 Dec 2019 13:50:58 -0400
+
 livecd-rootfs (2.633) focal; urgency=medium
 
   * Snapd for uc20 model assertions does not support global channel overrides.
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/48-policy-rc-d.binary b/live-build/buildd/hooks/48-policy-rc-d.binary
index fb3c481b..5d3b73dc 100755
--- a/live-build/buildd/hooks/48-policy-rc-d.binary
+++ b/live-build/buildd/hooks/48-policy-rc-d.binary
@@ -1,7 +1,18 @@
 #!/bin/sh
+
 set -e
 
 # This is run after 02-disk-image-uefi.binary because
 # we don't want policyrcd-script-zg2 installed in
 # bootable images.
+
+. config/functions
+
+cleanup() {
+    teardown_mountpoint chroot
+}
+trap cleanup EXIT
+
+setup_mountpoint chroot
+
 chroot chroot apt-get install -y policyrcd-script-zg2
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"