diff --git a/dev-python/elkm1-lib/Manifest b/dev-python/elkm1-lib/Manifest
index c21d16a3e..83ccbbca0 100644
--- a/dev-python/elkm1-lib/Manifest
+++ b/dev-python/elkm1-lib/Manifest
@@ -1,5 +1,5 @@
 DIST elkm1-lib-2.0.2.tar.gz 41998 BLAKE2B 08f44fcde7b47131d75a40a95b107e2035c42bf62a4d18c9484e1afa2acaf3f9bdac3af1ae33a4acbc1c893805da1f0504e466913461259b2c428c54d676c1d4 SHA512 a8c6c46128df024d8887333835defc0180b754ec49a4f15aea25cf2363c5dc6b9b88ca030694b76b6ad10873c487f13cb260f58aa52c0db528c9a0cd158a4950
-DIST elkm1-lib-2.2.1.tar.gz 41690 BLAKE2B a0ae0464141d62e9853c4c913bb9965b7ac19ac28d84b5d6f70ba1e792ec5d445313a53398e8a318816482138ca29e505bc50ba46ccc44e8d5dc096b7306437a SHA512 454dba658aede56b11949f38acefc832aaab6bc025a182ed372cf43cb463c105cebb814a3545f6302b00aadd6b277383bdd89a5fbf5fc4db574c9bb521ec76c4
-EBUILD elkm1-lib-2.0.2.ebuild 766 BLAKE2B 5bd62f86180ea327c5d652212aa3d25b1bccc773742a617b00211fa1b3bbc56859735217185b523d155a217e1396553b20fda2a079f892e9470611141a2b002d SHA512 c6940c5cc4239d444853003acab5e4c79392488fc8746d095a07b5d08216b69b8faf344163906b6b75069789f69b264940286e964150eafe23ce6d7a706bfc96
-EBUILD elkm1-lib-2.2.1.ebuild 916 BLAKE2B d94a38f210c0f2a8d20dce11d2e0b38c6920761dc1cd564dd73066ba9efbc8a3168e4d4cefb206b32ddd77f93625bb44bb3a57fe18a04efa6be78d1ee813be9f SHA512 9215610f576f1a1ca699b7a00610f7f536141ae335ceb657145d1a4728ab62042e0e7d4d8e06fddd75f774234e6a02da74d13a0b75521e45949bf24cc76dff4d
+DIST elkm1_lib-2.2.1.tar.gz 41690 BLAKE2B a0ae0464141d62e9853c4c913bb9965b7ac19ac28d84b5d6f70ba1e792ec5d445313a53398e8a318816482138ca29e505bc50ba46ccc44e8d5dc096b7306437a SHA512 454dba658aede56b11949f38acefc832aaab6bc025a182ed372cf43cb463c105cebb814a3545f6302b00aadd6b277383bdd89a5fbf5fc4db574c9bb521ec76c4
+EBUILD elkm1-lib-2.0.2.ebuild 727 BLAKE2B 47e4f607025b8ed52f46da93548aaf99bdc235dba547a3a3834d63a7c3b731d3067122a99b9f03feaae7007757d5cfbda53fe8ff722ce643c10ff018d245edb2 SHA512 e36621bc452abb0f9c9c24d1a1a473ad76f88f4ce02f10e94f14ecff8400fe038217fc2396e0a5e8497246004a1331206ba844cc8906c2b41c5fea9119863d6a
+EBUILD elkm1-lib-2.2.1.ebuild 757 BLAKE2B a29555791c21c0e7e9d5584f8a644049a72f32c7ce454ddd8cdf48a6bfaab632912fc8209e6ed9a3ef2c69b325e89bb8ed4971a2464dc0dbe08bff467b6b3e60 SHA512 cc2f41af9fe562c9e6442aadb560146d39c26f3031fdbeee8bd80d14fa8c053ea97a0fccba7739bd417a93472df85e4def9cf2497a085ca485c87118a82e49a2
 MISC metadata.xml 510 BLAKE2B 5286b277be43515fdf58afeff6b8dc8335aac67a9a0651409dbeeb4ee4694f04f2d08a259ad1aaee118706b247a862d05c628e3df9a31a31b638a5dcf2345724 SHA512 4a9ef72614886d20427c02f8b51ec524c8af29ec85896bcb4cab3fdca30d165ad744263fc4a85fbe7d069e9898739aa0a4e9680a319157206f84f2a47eb12568
diff --git a/dev-python/elkm1-lib/elkm1-lib-2.0.2.ebuild b/dev-python/elkm1-lib/elkm1-lib-2.0.2.ebuild
index abb2e8d54..a3c6ad109 100644
--- a/dev-python/elkm1-lib/elkm1-lib-2.0.2.ebuild
+++ b/dev-python/elkm1-lib/elkm1-lib-2.0.2.ebuild
@@ -1,15 +1,15 @@
-# 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=poetry
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Library for interacting with ElkM1 alarm/automation panel."
 HOMEPAGE="https://github.com/gwww/elkm1 https://pypi.org/project/elkm1-lib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -21,7 +21,6 @@ DOCS="README.md"
 
 RDEPEND=">=dev-python/pyserial-asyncio-0.5[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
diff --git a/dev-python/elkm1-lib/elkm1-lib-2.2.1.ebuild b/dev-python/elkm1-lib/elkm1-lib-2.2.1.ebuild
index 9106263ec..717e829fa 100644
--- a/dev-python/elkm1-lib/elkm1-lib-2.2.1.ebuild
+++ b/dev-python/elkm1-lib/elkm1-lib-2.2.1.ebuild
@@ -3,15 +3,12 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Library for interacting with ElkM1 alarm/automation panel."
 HOMEPAGE="https://github.com/gwww/elkm1 https://pypi.org/project/elkm1-lib/"
-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/pyserial-asyncio-0.5[${PYTHON_USEDEP}]
 	>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]