diff --git a/debian/changelog b/debian/changelog
index 4c3f3e99..78050981 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.827) UNRELEASED; urgency=medium
+
+  * Fix netboot tarball generation code to properly handle the recent change
+    of shim to use alternatives (and the path becoming a symlink).
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 13 Apr 2023 19:28:46 +0200
+
 livecd-rootfs (2.826) lunar; urgency=medium
 
   * Now that we moved the seeding for canary into further layers, a resed of
diff --git a/live-build/ubuntu-server/hooks/05-netboot-tarball.binary b/live-build/ubuntu-server/hooks/05-netboot-tarball.binary
index 658af15f..eef58f64 100755
--- a/live-build/ubuntu-server/hooks/05-netboot-tarball.binary
+++ b/live-build/ubuntu-server/hooks/05-netboot-tarball.binary
@@ -33,7 +33,12 @@ case $ARCH in
     amd64)
         mv chroot/usr/lib/PXELINUX/pxelinux.0                          tarball/amd64/pxelinux.0
         mv chroot/usr/lib/syslinux/modules/bios/ldlinux.c32            tarball/amd64/ldlinux.c32
-        mv chroot/usr/lib/shim/shimx64.efi.signed                      tarball/amd64/bootx64.efi
+	# For shim we're now using alternatives
+        if [ -e chroot/usr/lib/shim/shimx64.efi.signed.latest ]; then
+            mv chroot/usr/lib/shim/shimx64.efi.signed.latest           tarball/amd64/bootx64.efi
+        else
+            mv chroot/usr/lib/shim/shimx64.efi.signed                  tarball/amd64/bootx64.efi
+        fi
         mv chroot/usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed tarball/amd64/grubx64.efi
 
         mkdir tarball/amd64/grub tarball/amd64/pxelinux.cfg
@@ -54,7 +59,12 @@ EOF
         ;;
 
     arm64)
-        mv chroot/usr/lib/shim/shimaa64.efi.signed                     tarball/arm64/bootaa64.efi
+	# For shim we're now using alternatives
+        if [ -e chroot/usr/lib/shim/shimaa64.efi.signed.latest ]; then
+            mv chroot/usr/lib/shim/shimaa64.efi.signed.latest          tarball/arm64/bootaa64.efi
+        else
+            mv chroot/usr/lib/shim/shimaa64.efi.signed                 tarball/arm64/bootaa64.efi
+        fi
         mv chroot/usr/lib/grub/arm64-efi-signed/grubnetaa64.efi.signed tarball/arm64/grubaa64.efi
 
         mkdir tarball/arm64/grub