diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r2.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild
index 77c3ac637e..c8cabbf131 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild
@@ -18,18 +18,14 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 DEPEND="
-	sys-kernel/dracut
-	sys-kernel/coreos-bootkernel"
+	sys-kernel/dracut"
 
 src_install() {
-	modules_dir=${D}/usr/lib/dracut/modules.d/
-	mkdir -p $modules_dir
-	cp -R dracut/80gptprio $modules_dir
+	insinto /usr/lib/dracut/modules.d/
+	doins -r ${S}/dracut/80gptprio $modules_dir
 
-	mkdir ${D}/boot
-	for i in `ls /build/amd64-generic/boot/vmlinuz-*boot_kernel*`; do
-		ver=${i##*vmlinuz-}
-		chroot /build/amd64-generic dracut --force --fstab --kver ${ver} /tmp/initramfs-${ver}.img
-		cp /build/amd64-generic/tmp/initramfs-${ver}.img ${D}/boot/
-	done
+	chroot /build/amd64-generic dracut --no-kernel --fstab --no-compress /tmp/bootengine.cpio
+
+	insinto /usr/share/bootengine/
+	doins /build/amd64-generic/tmp/bootengine.cpio
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild
index 1162b4dd6e..c092388e37 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild
@@ -20,14 +20,11 @@ DEPEND="
 	sys-kernel/dracut"
 
 src_install() {
-	modules_dir=${D}/usr/lib/dracut/modules.d/
-	mkdir -p $modules_dir
-	cp -R dracut/80gptprio $modules_dir
+	insinto /usr/lib/dracut/modules.d/
+	doins -r ${S}/dracut/80gptprio $modules_dir
 
-	mkdir ${D}/boot
-	for i in `ls /build/amd64-generic/boot/vmlinuz-*boot_kernel*`; do
-		ver=${i##*vmlinuz-}
-		chroot /build/amd64-generic dracut --force --fstab --kver ${ver} /tmp/initramfs-${ver}.img
-		cp /build/amd64-generic/tmp/initramfs-${ver}.img ${D}/boot/
-	done
+	chroot /build/amd64-generic dracut --no-kernel --fstab --no-compress /tmp/bootengine.cpio
+
+	insinto /usr/share/bootengine/
+	doins /build/amd64-generic/tmp/bootengine.cpio
 }