diff --git a/data/live-build-config/hooks/live/17-gen_initramfs.chroot b/data/live-build-config/hooks/live/17-gen_initramfs.chroot
index 87b53bd..281ea11 100755
--- a/data/live-build-config/hooks/live/17-gen_initramfs.chroot
+++ b/data/live-build-config/hooks/live/17-gen_initramfs.chroot
@@ -9,4 +9,6 @@ if [ -e /boot/initrd.img-* ]; then
 	rm -f /boot/initrd.img-*
 fi
 
-update-initramfs -c -k `ls /boot | grep vmlinuz- | sed 's/vmlinuz-//g'`
+kversion=$(ls -1 boot | sed -n 's/^vmlinuz-//p' | tail -1)
+
+update-initramfs -c -k $kversion
diff --git a/data/live-build-config/hooks/live/19-kernel_symlinks.chroot b/data/live-build-config/hooks/live/19-kernel_symlinks.chroot
index e63ca26..684fa6c 100755
--- a/data/live-build-config/hooks/live/19-kernel_symlinks.chroot
+++ b/data/live-build-config/hooks/live/19-kernel_symlinks.chroot
@@ -2,5 +2,8 @@
 
 echo I: Creating kernel symlinks.
 cd /boot
-ln -s initrd.img-* initrd.img
-ln -s vmlinuz-* vmlinuz
+
+kversion=$(ls -1 boot | sed -n 's/^vmlinuz-//p' | tail -1)
+
+ln -s initrd.img-$kversion initrd.img
+ln -s vmlinuz-$kversion vmlinuz