diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
index c1f45a56b6..2e0de42339 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
@@ -12,7 +12,7 @@ CROS_WORKON_LOCALNAME="docker"
 CROS_WORKON_REPO="git://github.com"
 
 if [[ ${PV} == *9999 ]]; then
-	DOCKER_GITCOMMIT=""
+	DOCKER_GITCOMMIT="unknown"
 	KEYWORDS=""
 else
 	CROS_WORKON_COMMIT="0baf60984522744eed290348f33f396c046b2f3a" # v1.7.0
@@ -154,6 +154,10 @@ src_prepare() {
 	epatch_user
 }
 
+go_get_arch() {
+	echo ${ARCH}
+}
+
 src_compile() {
 	# if we treat them right, Docker's build scripts will set up a
 	# reasonable GOPATH for us
@@ -190,6 +194,11 @@ src_compile() {
 		unset DOCKER_EXPERIMENTAL
 	fi
 
+	export GOARCH=$(go_get_arch)
+	export CGO_ENABLED=1
+	export CC=$(tc-getCC)
+	export CXX=$(tc-getCXX)
+
 	# time to build!
 	./hack/make.sh dynbinary || die 'dynbinary failed'
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
index fbe0d78370..c573c0129a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -91,7 +91,7 @@ RDEPEND="${RDEPEND}
 	app-emulation/actool
 	app-emulation/rkt
 	app-emulation/xenstore
-	app-emulation/xenserver-pv-version
+	amd64? ( app-emulation/xenserver-pv-version )
 	sys-apps/findutils
 	sys-apps/which
 	app-admin/flannel
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild
index 9f4298b565..90df011e87 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="
-	app-emulation/open-vm-tools
+	amd64? ( app-emulation/open-vm-tools )
 	coreos-base/coreos
 	coreos-base/coreos-dev
 	dev-lang/python-oem
diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass
index e9bc5272e9..32e8068b88 100644
--- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass
+++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass
@@ -65,7 +65,7 @@ get_bootengine_lib() {
 # @FUNCTION: update_bootengine_cpio
 # @DESCRIPTION:
 # Append files in the given directory to the bootengine cpio.
-# Allows us to stick kernel modules into the initramfs built into bzImage.
+# Allows us to stick kernel modules into the initramfs built into the image.
 update_bootengine_cpio() {
 	local extra_root="$1"
 	local cpio_path="${KBUILD_OUTPUT}/bootengine.cpio"
@@ -84,7 +84,7 @@ update_bootengine_cpio() {
 
 kmake() {
 	local kernel_arch=$(tc-arch-kernel)
-	emake ARCH="${kernel_arch}" CROSS_COMPILE="${CHOST}-" "$@"
+	emake LDFLAGS="" ARCH="${kernel_arch}" CROSS_COMPILE="${CHOST}-" "$@"
 }
 
 # Discard the module signing key, we use new keys for each build.
@@ -153,7 +153,7 @@ coreos-kernel_src_compile() {
 	update_bootengine_cpio "${bootengine_root}"
 
 	# Build the final kernel image
-	kmake bzImage
+	kmake
 }
 
 coreos-kernel_src_install() {