diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest
index 34b610255d..72b8ad2f08 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest
@@ -1,3 +1,2 @@
-DIST repo-2.32 45787 BLAKE2B 658b9b343a5c5dc9a850cde62e24c942c72bab807dc94ccf55f92d51e9ff8d5a3d57ca818dca7512a3a7b073fc1fac9f22c533dcc71a9dbd918fdd63bc42fda3 SHA512 1ded71a8e5e052c012a131b914f9ce0f92a3846b29f76c167583196a5efb6fda913c944a8bcf40d41dc206cc529e780df0c6da7f3d4c21302105885dc3061093
-DIST repo-2.32.tar.gz 255696 BLAKE2B b63fa70b2fdcd02460216d3b4c5f04a7c334f3f52ceddc69ece5f3f9c239c3f5f6eaf2617d96d60ec838766ce1b6170e8906c5ddc787c90918d5e38fd90a8a23 SHA512 4ac7be6ecd865d3823d21baa8b96d76194ed648139088bc53685463b4a3d62696005881f53e9cc5f34d8457a0bb8b8cb1a0dd2e2e547d0432f21a5aee9bba9a0
 DIST repo-2.37.tar.gz 273445 BLAKE2B 7934581c5c55896d8ba58f5841a028f4676062197498ef601fa005f4e19428eee552e66d057a1e0d033eff8691df2de8e130ff96aec0e4537a462be81796e249 SHA512 6aa11e9fc9d899866dd89788c94ef188ea89dc6757a4e4fe0f1284898315723f72b3b97b60d39194f34e56332057545eb9c99b6483bc3e0513f747410226b9fa
+DIST repo-2.40.tar.gz 277118 BLAKE2B 57ebd20e323a4c3d02885c71f599bf57d23e68b8199b136095ce77a479a815439c51844b11744e0c9555091e91821ba49715c57d985a3a30579497b4617b6361 SHA512 0cd9df29edf14acdaeb0e4d07dea13f6e3bfa77ac36ffe7c4042d050c5d3fb36a7ff9a249e521aef7d7e5fbff9fe1c4b94df02c0d435353e0c169a94254f78ba
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.37.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.37.ebuild
index 3203603bb0..c51d27d5ee 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.37.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.37.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.32.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.40.ebuild
similarity index 65%
rename from sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.32.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.40.ebuild
index f073dc245d..3203603bb0 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.32.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.40.ebuild
@@ -7,18 +7,17 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-r1
 
 DESCRIPTION="Google tool for managing git, particularly multiple repos"
 HOMEPAGE="https://gerrit.googlesource.com/git-repo"
-SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
-	https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -29,7 +28,7 @@ RDEPEND="${PYTHON_DEPS}
 S="${WORKDIR}/git-${P}"
 
 src_install() {
-	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
+	python_foreach_impl python_doscript ${PN}
 	newbashcomp completion.bash ${PN}
 	doman man/*.[0-9]
 }