diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host
index 18565d18d3..5799017464 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host
@@ -4,9 +4,8 @@
 source "/mnt/host/source/.repo/manifests/version.txt"
 COREOS_VERSION_STRING="${COREOS_BUILD}.${COREOS_BRANCH}.${COREOS_PATCH}"
 
-FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect
-          -ebuild-locks parallel-install sandbox -strict userfetch userpriv
-          usersandbox -unknown-features-warn"
+# Tolerate collisions (for now), disable extra locking, ignore missing digests.
+FEATURES="-collision-protect -ebuild-locks -strict"
 
 # Since our portage comes from version control, we redirect distfiles
 DISTDIR="/var/lib/portage/distfiles"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target
index 52298043f2..f2c1de0d34 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target
@@ -16,10 +16,8 @@ PORTAGE_TMPDIR=${ROOT}tmp/
 
 PORT_LOGDIR=${ROOT}tmp/portage/logs/
 
-FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect
-          -ebuild-locks -force-mirror nodoc noinfo noman parallel-install
-          sandbox splitdebug -strict userfetch userpriv usersandbox
-          -unknown-features-warn"
+# Tolerate collisions (for now), disable extra locking, ignore missing digests.
+FEATURES="-collision-protect -ebuild-locks -strict"
 
 PORTAGE_WORKDIR_MODE="0755"
 PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/"
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
index 5ebf596172..1e2216eef3 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
@@ -50,3 +50,7 @@ CONFIG_PROTECT="
 # Use parallel bzip2 for binary packages
 PORTAGE_BZIP2_COMMAND="lbzip2"
 PORTAGE_BUNZIP2_COMMAND="lbunzip2"
+
+# Always build binary packages, remove old build logs, avoid running as root.
+FEATURES="buildpkg clean-logs compressdebug parallel-install splitdebug
+          userfetch userpriv usersandbox"
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
index 1a79c47761..2e714394f0 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
@@ -5,3 +5,6 @@ USE="cros-debug acpi usb pam"
 USE="${USE} -cros_host -expat -pic -pie -cairo -X"
 USE="${USE} -acl -cracklib -gpm -ipv6 -openmp -python -sha512"
 USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls"
+
+# Exclude documentation
+FEATURES="nodoc noinfo noman"