diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r218.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r219.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r218.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r219.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
index 525d57ed97..6f053276f0 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -131,6 +131,7 @@ RDEPEND="${RDEPEND}
 	sys-fs/aufs-util
 	sys-kernel/coreos-firmware
 	sys-kernel/coreos-kernel
+	sys-libs/nss-usrfiles
 	sys-libs/timezone-data
 	sys-process/lsof
 	sys-process/procps
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r156.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r157.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r156.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r157.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild
index f372563cfb..211e12436b 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild
@@ -88,10 +88,13 @@ RDEPEND="${RDEPEND}
 	>=media-libs/freetype-2.2.1
 	net-misc/gsutil
 	sys-apps/usbutils
+	sys-apps/systemd
+	sys-apps/systemd-sysv-utils
 	!sys-apps/nih-dbus-tool
 	=sys-devel/automake-1.10*
 	sys-fs/sshfs-fuse
 	sys-libs/libnih
+	sys-libs/nss-usrfiles
 	sys-power/iasl
 	virtual/udev
 	dev-libs/protobuf-c
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages
index f785fb739c..b3d2b41785 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages
@@ -1,3 +1,4 @@
 -*sys-apps/busybox
 -*sys-apps/kbd
 *app-arch/lbzip2
+*sys-libs/nss-usrfiles
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages.build
index ce44347b43..92aece4f20 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages.build
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages.build
@@ -1 +1,2 @@
 app-arch/lbzip2
+sys-libs/nss-usrfiles
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild
new file mode 120000
index 0000000000..9625e61a55
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild
@@ -0,0 +1 @@
+nss-usrfiles-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1_pre.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1_pre.ebuild
deleted file mode 100644
index f25c29689c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1_pre.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (c) 2013 The CoreOS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-CROS_WORKON_COMMIT="47016ef8e5fb5436d62bd34fea69f15b9f3343c1"
-CROS_WORKON_PROJECT="marineam/nss-altfiles"
-CROS_WORKON_LOCALNAME="nss-altfiles"
-CROS_WORKON_REPO="git://github.com"
-
-inherit cros-workon
-
-# The default files are provided by baselayout
-BASELAYOUT_PV="2.2"
-BASELAYOUT_P="baselayout-${BASELAYOUT_PV}"
-
-DESCRIPTION="NSS module for data sources under /usr on for CoreOS"
-HOMEPAGE="https://github.com/marineam/nss-altfiles"
-SRC_URI="mirror://gentoo/${BASELAYOUT_P}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/${BASELAYOUT_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	cros-workon_src_unpack
-	default
-}
-
-src_configure() {
-	: # Don't bother with the custom configure script.
-}
-
-src_compile() {
-	emake DATADIR=/usr/share/nss MODULE_NAME=usrfiles
-}
-
-src_install() {
-	dolib.so libnss_usrfiles.so.2
-
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.conf" "${PN}.conf"
-
-	insinto /usr/share/nss
-	doins "${FILESDIR}/nsswitch.conf"
-	# imported from glibc 2.18 (not provided by baselayout)
-	doins "${FILESDIR}/rpc"
-
-	# gentoo defaults from baselayout
-	for file in hosts networks protocols services; do
-		doins "${WORKDIR}/${BASELAYOUT_P}/etc/${file}"
-	done
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild
new file mode 100644
index 0000000000..8bf273972a
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright (c) 2013 The CoreOS Authors. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+CROS_WORKON_PROJECT="coreos/nss-altfiles"
+CROS_WORKON_LOCALNAME="nss-altfiles"
+CROS_WORKON_REPO="git://github.com"
+
+if [[ "${PV}" == 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	CROS_WORKON_COMMIT="508d986e38c70bd0636740d287d2fe807822fb57" # v2.18.1
+	KEYWORDS="amd64 arm x86"
+fi
+
+inherit cros-workon
+
+DESCRIPTION="NSS module for data sources under /usr on for CoreOS"
+HOMEPAGE="https://github.com/coreos/nss-altfiles"
+SRC_URI=""
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_configure() {
+	: # Don't bother with the custom configure script.
+}
+
+src_compile() {
+	emake DATADIR=/usr/share/baselayout MODULE_NAME=usrfiles
+}
+
+src_install() {
+	dolib.so libnss_usrfiles.so.2
+}