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 d50bd1f5fa..0faa0c9131 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
@@ -1,9 +1,5 @@
 # See "man make.conf" for the available options.
 
-ACCEPT_KEYWORDS="amd64"
-CHOST="x86_64-pc-linux-gnu"
-CFLAGS="-O2 -pipe"
-LDFLAGS="-Wl,-O2 -Wl,--as-needed"
 FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect
           -ebuild-locks parallel-install sandbox -strict userfetch userpriv
           usersandbox -unknown-features-warn"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target
index d68b4655b7..f82d08993e 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target
@@ -5,8 +5,6 @@
 # Pull in definition of at least { ROOT, CHOST, [BOARD_OVERLAY] }
 source make.conf.board_setup
 
-ACCEPT_KEYWORDS="amd64"
-
 # Common settings across all board targets.
 source make.conf.common
 
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 a30d9ef399..cf2d98f027 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
@@ -10,10 +10,6 @@
 CBUILD=x86_64-pc-linux-gnu
 HOSTCC=x86_64-pc-linux-gnu-gcc
 
-LDFLAGS="-Wl,-O2 -Wl,--as-needed"
-
-ACCEPT_KEYWORDS="${ARCH}"
-
 # Be sure we don't overwrite pkgs from another sysroot.
 PKGDIR=${ROOT}packages/
 PORTAGE_TMPDIR=${ROOT}tmp/
@@ -27,7 +23,6 @@ FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect
 
 PORTAGE_WORKDIR_MODE="0755"
 PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/"
-ELIBC="glibc"
 
 PORTDIR="/usr/local/portage/stable"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/make.defaults
index 51527afa55..7b40b63b3f 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/make.defaults
@@ -42,7 +42,7 @@ VIDEO_CARDS="dummy fbdev v4l"
 # after discussion on the gentoo-dev ML. As we bang out a clear
 # direction with how LDFLAGS will be set by default, this entry
 # may move.
-LDFLAGS="-Wl,-O1"
+LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
 # 2009/09/21 Robin H. Johnson <robbat2@gentoo.org>
 # http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml