diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/Manifest
new file mode 100644
index 0000000000..3d4e00e121
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/Manifest
@@ -0,0 +1 @@
+DIST nss-usrfiles-c8e05a08a2e28eb48c6c788e3007d94f8d8de5cd.tar.gz 26979 BLAKE2B b77c55237e848e251ba589418e3ef228a6bc1b19c77c4ba4141b4412ce0be70429ad3a262ff42d6b5187b97f68214062dc759055b94fa25ae9b8de1f6484ed5f SHA512 53e68869c9dac2573889c0fdf2b5d58029f72c20ff3ea28a871978fc7957b5b1ebfe09112ebe13d14eefc357183ce1eacec6e692595d88cbd50f35cd262e12aa
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/metadata.xml
index 64847d14b7..1b8bf50504 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/metadata.xml
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>ryao@gentoo.org</email>
-		<name>Richard Yao</name>
-	</maintainer>
 	<upstream>
-		<remote-id type="github">coreos/nss-altfiles</remote-id>
+		<remote-id type="github">flatcar/nss-altfiles</remote-id>
 	</upstream>
 </pkgmetadata>
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
index 7c993098df..f2436c60e1 100644
--- 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
@@ -1,33 +1,30 @@
 # Copyright (c) 2013 The CoreOS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-EGIT_REPO_URI="https://github.com/flatcar/nss-altfiles.git"
+EAPI=8
 
-if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/flatcar/nss-altfiles.git"
+	inherit git-r3
 else
-	EGIT_COMMIT="c8e05a08a2e28eb48c6c788e3007d94f8d8de5cd" # main
+	EGIT_VERSION="c8e05a08a2e28eb48c6c788e3007d94f8d8de5cd" # main
+	SRC_URI="https://github.com/flatcar/nss-altfiles/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/nss-altfiles-${EGIT_VERSION}"
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 
-inherit git-r3 toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="NSS module for data sources under /usr on for CoreOS"
-HOMEPAGE="https://github.com/coreos/nss-altfiles"
-SRC_URI=""
+DESCRIPTION="NSS module for data sources under /usr on for Flatcar"
+HOMEPAGE="https://github.com/flatcar/nss-altfiles"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 src_configure() {
 	tc-export CC
 	econf \
-		--datadir=/usr/share/baselayout \
+		--datadir="${EPREFIX}/usr/share/baselayout" \
 		--with-module-name=usrfiles \
 		--with-types=all
 }