diff --git a/build_library/grub_install.sh b/build_library/grub_install.sh
index 61e2fc6fb8..0c0dfe0bb0 100755
--- a/build_library/grub_install.sh
+++ b/build_library/grub_install.sh
@@ -75,7 +75,9 @@ esac
 info "Updating GRUB in ${BOARD_ROOT}"
 emerge-${BOARD} \
         --nodeps --select --verbose --update --getbinpkg --usepkgonly --newuse \
-        sys-boot/grub
+        sys-boot/grub \
+        sys-boot/shim \
+        sys-boot/shim-signed
 
 GRUB_SRC="${BOARD_ROOT}/usr/lib/grub/${FLAGS_target}"
 [[ -d "${GRUB_SRC}" ]] || die "GRUB not installed at ${GRUB_SRC}"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.12.35.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.12.35.ebuild
index a8b19410cb..cea1123a3e 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.12.35.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.12.35.ebuild
@@ -37,10 +37,12 @@ DEPEND="
 	sys-apps/shadow
 	sys-apps/systemd[cryptsetup]
 	sys-apps/seismograph
-	sys-apps/util-linux
+	sys-apps/util-linux[cryptsetup,udev]
 	sys-block/open-iscsi
 	sys-fs/btrfs-progs
+	sys-fs/cryptsetup[udev]
 	sys-fs/e2fsprogs
+	sys-fs/lvm2[udev]
 	sys-fs/mdadm
 	sys-fs/xfsprogs
 	>=sys-kernel/bootengine-0.0.38-r37:=