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 32e8068b88..a8c47ce2e3 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
@@ -2,6 +2,14 @@
 # Copyright 2012 The Chromium OS Authors.
 # Distributed under the terms of the GNU General Public License v2
 
+# @ECLASS-VARIABLE: COREOS_SOURCE_REVISION
+# @DESCRIPTION:
+# Revision of the source ebuild, e.g. -r1. default is ""
+: ${COREOS_SOURCE_REVISION:=}
+
+COREOS_SOURCE_VERSION="${PV}${COREOS_SOURCE_REVISION}"
+COREOS_SOURCE_NAME="linux-${PV}-coreos${COREOS_SOURCE_REVISION}"
+
 [[ ${EAPI} != "5" ]] && die "Only EAPI=5 is supported"
 
 inherit linux-info toolchain-funcs
@@ -11,14 +19,14 @@ LICENSE="GPL-2 freedist"
 SLOT="0/${PVR}"
 SRC_URI=""
 
-DEPEND="~sys-kernel/coreos-sources-${PV}
+DEPEND="=sys-kernel/coreos-sources-${COREOS_SOURCE_VERSION}
 	sys-kernel/bootengine:="
 
 # Do not analyze or strip installed files
 RESTRICT="binchecks strip"
 
 # Use source installed by coreos-sources
-KERNEL_DIR="${SYSROOT}/usr/src/linux-${PV}"
+KERNEL_DIR="${SYSROOT}/usr/src/${COREOS_SOURCE_NAME}"
 S="${KERNEL_DIR}"
 # Cache kernel build tree under /var
 KBUILD_OUTPUT="${SYSROOT}/var/cache/portage/${CATEGORY}/${PN}"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.0.7.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.0.7-r1.ebuild
similarity index 86%
rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.0.7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.0.7-r1.ebuild
index 8d92cdc8bb..4cdc6203e3 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.0.7.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.0.7-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+COREOS_SOURCE_REVISION="-r1"
 inherit coreos-kernel
 
 DESCRIPTION="CoreOS Linux kernel"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.0.7.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.0.7-r1.ebuild
similarity index 53%
rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.0.7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.0.7-r1.ebuild
index 268a69f403..76eae277bc 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.0.7.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.0.7-r1.ebuild
@@ -2,18 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
 ETYPE="sources"
 inherit kernel-2
 detect_version
 
-DESCRIPTION="Full sources for the Linux kernel"
+DESCRIPTION="Full sources for the CoreOS Linux kernel"
 HOMEPAGE="http://www.kernel.org"
 SRC_URI="${KERNEL_URI}"
 
 KEYWORDS="amd64 arm64"
 IUSE=""
-
-# This ebuild is essentially equivalent to the upstream vanilla-sources
-DEPEND="!sys-kernel/vanilla-sources:${SLOT}"