diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/Manifest
index ff0c0c21a2..677084c74d 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/Manifest
@@ -1 +1 @@
-DIST 20190124.tar.gz 126211 BLAKE2B 7608ec8370f9c1aa1da4cf0f0ec20ff86ef07846bdcb6aabac6de441326a78e98b559502b11ee4028065eb8056f9ee6c2f3247e26485e8c9af70892d955236f7 SHA512 8f12c2a361ebd833b0eb3fa6ef26f42a82b4ef6497d8e5231eeaaf5b2e6dd1662ec596e1bbad73e06207ac29e098863311538c360c62efe9fd5cc9b58d1b8ad4
+DIST google-compute-engine-20190124.tar.gz 126211 BLAKE2B 7608ec8370f9c1aa1da4cf0f0ec20ff86ef07846bdcb6aabac6de441326a78e98b559502b11ee4028065eb8056f9ee6c2f3247e26485e8c9af70892d955236f7 SHA512 8f12c2a361ebd833b0eb3fa6ef26f42a82b4ef6497d8e5231eeaaf5b2e6dd1662ec596e1bbad73e06207ac29e098863311538c360c62efe9fd5cc9b58d1b8ad4
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r2.ebuild
similarity index 64%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r2.ebuild
index 0d61ec344a..40a7a10e63 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r2.ebuild
@@ -1,27 +1,26 @@
 # Copyright (c) 2016-2018 CoreOS, Inc. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit eutils
+PYTHON_COMPAT=( python3_11 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
 
 DESCRIPTION="Linux Guest Environment for Google Compute Engine"
 HOMEPAGE="https://github.com/GoogleCloudPlatform/compute-image-packages"
-SRC_URI="https://github.com/GoogleCloudPlatform/compute-image-packages/archive/${PV}.tar.gz"
-
+SRC_URI="https://github.com/GoogleCloudPlatform/compute-image-packages/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/compute-image-packages-${PV}"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
+KEYWORDS="amd64"
 
 # These dependencies cover all commands called by the scripts.
 RDEPEND="
 	app-admin/sudo
-	dev-python/boto
-	dev-python/distro
-	dev-python/setuptools
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
 	sys-apps/ethtool
 	sys-apps/coreutils
 	sys-apps/gawk
@@ -29,13 +28,3 @@ RDEPEND="
 	sys-apps/iproute2
 	sys-apps/shadow
 "
-
-S="${WORKDIR}/compute-image-packages-${PV}"
-
-src_compile() {
-	(cd "${S}" && exec python3 setup.py build)
-}
-
-src_install() {
-	(cd "${S}" && exec python3 setup.py install -O1 --skip-build --root "${D}")
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/metadata.xml
new file mode 100644
index 0000000000..27ed1673d1
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/metadata.xml
@@ -0,0 +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">GoogleCloudPlatform/compute-image-packages</remote-id>
+	</upstream>
+</pkgmetadata>