diff --git a/debian/changelog b/debian/changelog
index 866cd5e2..ceee9ea1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 livecd-rootfs (2.408.62) UNRELEASED; urgency=medium
 
+   [ Dimitri John Ledkov & Joshua Powers ]
+   * amd64: always install grub-pc with shim-signed (LP: #1901906), and
+     ensure to autoremove packages
+
   [ Patrick Viafore ]
   * Increase Vagrant disk size from 10G to 40G (LP: #1580596)
 
diff --git a/live-build/auto/config b/live-build/auto/config
index e8a4cdc0..839d5a5b 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -501,8 +501,7 @@ case $PROJECT in
 					add_package install grub-pc
 					;;
 				amd64)
-					add_package install grub-pc-bin
-					add_package install grub-efi-amd64-signed
+					add_package install grub-pc
 					add_package install shim-signed
 					;;
 				armhf)
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary
index b97ef55b..a5202d7c 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary
@@ -33,6 +33,7 @@ install_grub() {
     chroot mountpoint apt-get -qqy update
     chroot mountpoint apt-get -qqy install grub2
     chroot mountpoint apt-get -qqy remove --purge grub-legacy-ec2
+    chroot mountpoint apt-get autoremove --purge --assume-yes
 
     # set the kernel commandline to use hvc0
     mkdir -p mountpoint/etc/default/grub.d
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
index 65dd557a..5f5550cf 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
@@ -86,12 +86,14 @@ install_grub() {
             efi_target=arm64-efi
             ;;
         amd64)
-            chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed
+            chroot mountpoint apt-get install -qqy grub-pc shim-signed
             grub_modules="multiboot serial usb usb_keyboard"
             efi_target=x86_64-efi
             ;;
     esac
 
+    chroot mountpoint apt-get autoremove --purge --assume-yes
+
     cat << EOF >> mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg
 ${IMAGE_STR}
 # For Cloud Image compatability
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary
index b547cd08..6dbab189 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary
@@ -132,6 +132,7 @@ fi
 if [ "$ARCH" = "s390x" ]; then
     # Do ZIPL install bits
     chroot mountpoint apt-get -qqy install s390-tools sysconfig-hardware
+    chroot mountpoint apt-get autoremove --purge --assume-yes
 
     # Write out cloudy zipl.conf for future kernel updates
     cat << EOF > mountpoint/etc/zipl.conf
diff --git a/live-build/ubuntu-cpc/hooks.d/base/wsl-gz.binary b/live-build/ubuntu-cpc/hooks.d/base/wsl-gz.binary
index 3ab9b257..18585abc 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/wsl-gz.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/wsl-gz.binary
@@ -35,6 +35,7 @@ cp -a binary/boot/filesystem.dir/ $rootfs_dir
 setup_mountpoint $rootfs_dir
 
 env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get -y -qq install ubuntu-wsl
+env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get autoremove --purge --assume-yes
 
 create_manifest $rootfs_dir livecd.ubuntu-cpc.wsl.rootfs.manifest
 teardown_mountpoint $rootfs_dir