diff --git a/dev-python/upcloud-api/Manifest b/dev-python/upcloud-api/Manifest
index 15ac2efec..7226768e6 100644
--- a/dev-python/upcloud-api/Manifest
+++ b/dev-python/upcloud-api/Manifest
@@ -1,3 +1,3 @@
-DIST upcloud-api-2.0.0.tar.gz 57275 BLAKE2B 40a56381fc037fbe10e3eee7db8e55f4191089ec977d692207309a782458e28f6a2798f13f06ec9b357ac5f7701bef8d49b59ae444538ee88bd44ba40a950156 SHA512 a1d8a5b737621384a16b08d0527ebe778eb6b4a17d979e1b203ac301c3754a484273a9126c12c66da2c76571eccb27ce068f735f4e8c9e79b5419b6e566a8050
-EBUILD upcloud-api-2.0.0.ebuild 793 BLAKE2B bdf71d0aa4e4cc4d18476622cf26d32b0d760b218dc4f3e06c0b9fbdd78a01768ea1834ffd36d968952547e1c2d3680dddf0b904360efc04c5a77c27bd61559e SHA512 12ad27f23cf232405f17c5de1fb94a4538d411b667fe67996fc15c27c859621b34f585784b6afb14d475233832f5264f49b6be224ca6b03a0e8cc4131dc3404c
+DIST upcloud_api-2.0.0.tar.gz 57275 BLAKE2B 40a56381fc037fbe10e3eee7db8e55f4191089ec977d692207309a782458e28f6a2798f13f06ec9b357ac5f7701bef8d49b59ae444538ee88bd44ba40a950156 SHA512 a1d8a5b737621384a16b08d0527ebe778eb6b4a17d979e1b203ac301c3754a484273a9126c12c66da2c76571eccb27ce068f735f4e8c9e79b5419b6e566a8050
+EBUILD upcloud-api-2.0.0.ebuild 666 BLAKE2B 6dea437a6c28bb4894be53f9217468e6700241b7bc681ad106ec631800feb70e3cd0bd050120422bb888503c19f2b049851b1478ef660a787ffa9f6e9bcf9a8e SHA512 fa00bcb880e6ffbf569d65c9eb317609d6a8d6397fdd39d200648cd9d3e1f623f327094e4a9818face574f76338290cb2403e2ee2c1cbe8d4cdece7ce164d0bb
 MISC metadata.xml 519 BLAKE2B f2d077519741d07536579278941f3a99f0bb244c801dd2f4f765f5d1f7508997caea47c269de04337f5910630f3f64f80ea59d479d26379269afeefe0c5e1a14 SHA512 a2de195ae501a05c5b11a36cb73e4fef78256470826039eb74bc99be555bc84e63d34324f097e67d1f1c526326edf71edaea0aea8d9709680d86dd42586f7f15
diff --git a/dev-python/upcloud-api/upcloud-api-2.0.0.ebuild b/dev-python/upcloud-api/upcloud-api-2.0.0.ebuild
index 4f2d4f2fd..1190db801 100644
--- a/dev-python/upcloud-api/upcloud-api-2.0.0.ebuild
+++ b/dev-python/upcloud-api/upcloud-api-2.0.0.ebuild
@@ -1,17 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
 
 DESCRIPTION="UpCloud API Client"
 HOMEPAGE="https://github.com/UpCloudLtd/upcloud-python-api https://pypi.org/project/upcloud-api/"
-MY_PN=${PN/-/_}
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -24,7 +21,6 @@ DOCS="README.md"
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"