diff --git a/dev-python/hatchling/hatchling-0.24.0.ebuild b/dev-python/hatchling/hatchling-0.24.0.ebuild
index c36ac5b6d5435..c768e17f0e8ee 100644
--- a/dev-python/hatchling/hatchling-0.24.0.ebuild
+++ b/dev-python/hatchling/hatchling-0.24.0.ebuild
@@ -13,10 +13,10 @@ MY_P=hatch-${TAG}
 DESCRIPTION="Modern, extensible Python build backend"
 HOMEPAGE="
 	https://pypi.org/project/hatchling/
-	https://github.com/ofek/hatch/
+	https://github.com/pypa/hatch/
 "
 SRC_URI="
-	https://github.com/ofek/hatch/archive/${TAG}.tar.gz
+	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
 		-> ${MY_P}.tar.gz
 "
 S=${WORKDIR}/${MY_P}/backend
diff --git a/dev-python/hatchling/metadata.xml b/dev-python/hatchling/metadata.xml
index d4956b5316050..585828baa4a23 100644
--- a/dev-python/hatchling/metadata.xml
+++ b/dev-python/hatchling/metadata.xml
@@ -5,7 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ofek/hatch</remote-id>
+		<remote-id type="github">pypa/hatch</remote-id>
 		<remote-id type="pypi">hatchling</remote-id>
 	</upstream>
 </pkgmetadata>