diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.8.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.8-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.8.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.8-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild
index a950752947..e1c1b8dc7e 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild
@@ -6,7 +6,7 @@ CROS_WORKON_PROJECT="coreos/fleet"
 CROS_WORKON_LOCALNAME="fleet"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/fleet"
-inherit coreos-doc cros-workon coreos-go systemd
+inherit cros-workon coreos-go systemd
 
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
@@ -43,6 +43,4 @@ src_install() {
 	# Install sysusers.d snippet which adds fleet group and adds core user into it
 	insinto /usr/lib/sysusers.d/
 	newins "${FILESDIR}"/sysusers.d/${PN}.conf ${PN}.conf
-
-	coreos-dodoc -r Documentation/*
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.12.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.12.0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.12.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.12.0-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
index 899f962fbf..ef52a75ce1 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
@@ -6,7 +6,7 @@ CROS_WORKON_PROJECT="coreos/coreos-cloudinit"
 CROS_WORKON_LOCALNAME="coreos-cloudinit"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/coreos-cloudinit"
-inherit coreos-doc cros-workon systemd toolchain-funcs udev coreos-go
+inherit cros-workon systemd toolchain-funcs udev coreos-go
 
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
@@ -53,6 +53,4 @@ src_install() {
 	systemd_dounit units/*.target
 	systemd_enable_service default.target system-config.target
 	systemd_enable_service default.target user-config.target
-
-	coreos-dodoc -r Documentation/*
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r3.ebuild
similarity index 89%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r3.ebuild
index 8d8710622e..9a8a2696a3 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r3.ebuild
@@ -8,7 +8,7 @@ EAPI=5
 CROS_WORKON_PROJECT="coreos/etcd"
 CROS_WORKON_LOCALNAME="etcd"
 CROS_WORKON_REPO="git://github.com"
-inherit coreos-doc toolchain-funcs cros-workon systemd
+inherit toolchain-funcs cros-workon systemd
 
 if [[ "${PV}" == 9999 ]]; then
     KEYWORDS="~amd64"
@@ -37,6 +37,4 @@ src_install() {
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
-
-	coreos-dodoc -r Documentation/*
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.7.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.7-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.7-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
index d88bc61a21..9b7033e39d 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
@@ -9,7 +9,7 @@ CROS_WORKON_PROJECT="coreos/etcd"
 CROS_WORKON_LOCALNAME="etcd"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/etcd"
-inherit coreos-doc coreos-go toolchain-funcs cros-workon systemd
+inherit coreos-go toolchain-funcs cros-workon systemd
 
 if [[ "${PV}" == 9999 ]]; then
     CROS_WORKON_COMMIT=${CROS_WORKON_COMMIT:="HEAD"}
@@ -42,6 +42,4 @@ src_install() {
 
 	systemd_dounit "${FILESDIR}/${PN}${SLOT}.service"
 	systemd_dotmpfilesd "${FILESDIR}/${PN}${SLOT}.conf"
-
-	coreos-dodoc -r Documentation/*
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-doc.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-doc.eclass
deleted file mode 100644
index 0cbe21a520..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-doc.eclass
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2015 CoreOS, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: coreos-doc.eclass
-# @BLURB: utility function for including documentation
-
-# @FUNCTION: coreos-dodoc
-# @USAGE: [-r] <list of docs>
-coreos-dodoc() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	local flags
-	if [[ "${1}" == "-r" ]] ; then
-		flags="-r"
-		shift
-	fi
-
-	[[ "${#}" -lt 1 ]] && die "${0}: at least one file needed"
-
-	insinto "/usr/share/coreos/doc/${P}/"
-	doins $flags "$@"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.11.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.11.2-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.11.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.11.2-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
index e80dfb4e34..40ef92a620 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
@@ -6,7 +6,7 @@ CROS_WORKON_PROJECT="coreos/ignition"
 CROS_WORKON_LOCALNAME="ignition"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/ignition"
-inherit coreos-doc coreos-go cros-workon systemd udev
+inherit coreos-go cros-workon systemd udev
 
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
@@ -35,6 +35,4 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/ignition.target
 	systemd_dounit "${FILESDIR}"/ignition-disks.service
 	systemd_dounit "${FILESDIR}"/ignition-files.service
-
-	coreos-dodoc -r doc/*
 }