diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.3.ebuild
index b061595e4a..a9b8d224b0 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.3.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.3.ebuild
@@ -78,6 +78,12 @@ TARBALL_PV=${PV}
 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
 	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.18-0001-portage-repository-config.py-add-disabled-attribute-.patch"
+	"${FILESDIR}/${PN}-2.2.18-0002-environment-Filter-EROOT-for-all-EAPIs.patch"
+	"${FILESDIR}/${PN}-2.2.18-0003-depgraph-ensure-slot-rebuilds-happen-in-the-correct-.patch"
+)
+
 pkg_setup() {
 	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
 }
@@ -85,6 +91,9 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	# CoreOS does not use the gentoo repo, silence oodles of errors about it:
+	echo "# no defaults, configuration is in /etc" > cnf/repos.conf
+
 	if use native-extensions; then
 		printf "[build_ext]\nportage-ext-modules=true\n" >> \
 			setup.cfg || die