diff --git a/live-build/auto/config b/live-build/auto/config
index 9f70643e..325422d9 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1005,7 +1005,14 @@ case $PROJECT in
 						exit 1
 					fi
 
-					add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor $kernel_metapkg
+					add_pass ubuntu-server-minimal.ubuntu-server.installer.$flavor
+					if [ $flavor == ga ]; then
+						kernel_layer=ubuntu-server-minimal
+					else
+						kernel_layer=ubuntu-server-minimal.ubuntu-server.installer.$flavor
+					fi
+					add_package $kernel_layer $kernel_metapkg
+
 					LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server-minimal.ubuntu-server.installer.$flavor"
 				done
 				case $ARCH in
diff --git a/live-build/ubuntu-server/hooks/04-kernel-bits.binary b/live-build/ubuntu-server/hooks/04-kernel-bits.binary
old mode 100755
new mode 100644
index 551c7a42..60d76181
--- a/live-build/ubuntu-server/hooks/04-kernel-bits.binary
+++ b/live-build/ubuntu-server/hooks/04-kernel-bits.binary
@@ -15,6 +15,9 @@ esac
 
 PROJECT=$PROJECT${SUBARCH:+-$SUBARCH}
 
+# ensure this initrd is casperized
+chroot chroot update-initramfs -u
+
 # Fish out generated kernel image and initrd
 mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-$flavor
 mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-$flavor