diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/Manifest b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/Manifest
new file mode 100644
index 0000000000..8a82630623
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/Manifest
@@ -0,0 +1 @@
+DIST coreos-init-860090d932a0bcdf71a73619f270845a06b64af0.tar.gz 59420 BLAKE2B 4e68bf5e2f5d64a0c701cbfccf8641f362597073f599ad7e14816e6eb2167609b2312b81a40276736441f51cc1833677a985a3f8d81a21879b987028e60f8d0a SHA512 357f3ff2ac7e4f2ef412626674f8e81c71f38924b80d54fcdf23246c772373e6a6f9f940f66fcab19f09b759d547b7600c6fb97171c95db97e208392d66ce8ca
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
index 54b75bb7a0..0a22231db5 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -2,43 +2,45 @@
 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-EGIT_REPO_URI="https://github.com/flatcar/init.git"
-
-if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-else
-	EGIT_COMMIT="860090d932a0bcdf71a73619f270845a06b64af0" # flatcar-master
-	KEYWORDS="amd64 arm arm64 x86"
-fi
+EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
+inherit systemd python-any-r1
 
-inherit git-r3 systemd python-any-r1
+DESCRIPTION="Init scripts for Flatcar"
+HOMEPAGE="https://github.com/flatcar/init"
 
-DESCRIPTION="Init scripts for CoreOS"
-HOMEPAGE="http://www.coreos.com/"
-SRC_URI=""
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/flatcar/init.git"
+	inherit git-r3
+else
+	EGIT_VERSION="860090d932a0bcdf71a73619f270845a06b64af0" # flatcar-master
+	SRC_URI="https://github.com/flatcar/init/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/init-${EGIT_VERSION}"
+	KEYWORDS="amd64 arm arm64 x86"
+fi
 
 LICENSE="BSD"
 SLOT="0/${PVR}"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # Daemons we enable here must installed during build/install in addition to
 # during runtime so the systemd unit enable step works.
 DEPEND="
 	net-misc/openssh
 	net-nds/rpcbind
-	!coreos-base/oem-service
-	test? ( ${PYTHON_DEPS} )
-	"
+"
 RDEPEND="${DEPEND}
 	app-admin/logrotate
 	sys-block/parted
 	sys-apps/gptfdisk
 	>=sys-apps/systemd-207-r5
 	>=coreos-base/coreos-cloudinit-0.1.2-r5
-	"
+"
+BDEPEND="
+	test? ( ${PYTHON_DEPS} )
+"
 
 src_install() {
 	emake DESTDIR="${D}" install
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/metadata.xml
index 097975e3ad..a2967b825b 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/metadata.xml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/metadata.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<upstream>
+		<remote-id type="github">flatcar/init</remote-id>
+	</upstream>
 </pkgmetadata>