diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r25.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r25.ebuild
deleted file mode 120000
index 085f25c3cb..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r25.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-bootengine-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r26.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r26.ebuild
new file mode 120000
index 0000000000..ee2a88a015
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r26.ebuild
@@ -0,0 +1 @@
+bootengine-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1.ebuild
deleted file mode 100644
index 3a87cfdd83..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) 2013 CoreOS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_COMMIT="2c80368fb150a18fee29ff2145458956fc0751cc"
-CROS_WORKON_PROJECT="coreos/bootengine"
-CROS_WORKON_LOCALNAME="bootengine"
-CROS_WORKON_OUTOFTREE_BUILD=1
-CROS_WORKON_REPO="git://github.com"
-
-inherit cros-workon cros-debug cros-au
-
-DESCRIPTION="CoreOS Bootengine"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	app-arch/gzip
-	app-shells/bash
-	coreos-base/vboot_reference
-	sys-apps/coreutils
-	sys-apps/findutils
-	sys-apps/grep
-	sys-apps/kbd
-	sys-apps/kexec-tools
-	sys-apps/less
-	sys-apps/sed
-	sys-apps/systemd
-	sys-apps/systemd-sysv-utils
-	sys-apps/util-linux
-	sys-kernel/dracut
-	virtual/udev
-	"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /usr/lib/dracut/modules.d/
-	doins -r dracut/.
-	dosbin update-bootengine
-}
-
-# We are bad, we want to get around the sandbox.  So do the creation of the
-# cpio image in pkg_postinst() where we are free to mount filesystems, chroot,
-# and other fun stuff.
-pkg_postinst() {
-	if [[ -n "${ROOT}" ]]; then
-		${ROOT}/usr/sbin/update-bootengine -m -c ${ROOT} || die
-	else
-		update-bootengine || die
-	fi
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild
index 50c6595e7c..d066bd4963 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild
@@ -7,6 +7,13 @@ CROS_WORKON_LOCALNAME="bootengine"
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_REPO="git://github.com"
 
+if [[ "${PV}" == 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	CROS_WORKON_COMMIT="d523f3055c6eb0a95b8074b3651d2ea23d512efc"
+	KEYWORDS="amd64 arm x86"
+fi
+
 inherit cros-workon cros-debug cros-au
 
 DESCRIPTION="CoreOS Bootengine"