diff --git a/dev-python/invoke/Manifest b/dev-python/invoke/Manifest
index cba2b82ab..7e73e104f 100644
--- a/dev-python/invoke/Manifest
+++ b/dev-python/invoke/Manifest
@@ -1,2 +1 @@
-DIST invoke-1.5.0.tar.gz 338382 BLAKE2B f4297053beace335fc22413f488b5da081e598e6f4839d88c912bbd2b22374bf1caf2e78137997a7dddd9c2e9e2276225fb3b39b61ceb7d67846f2c7723365d0 SHA512 ac6b1939907ba34930836f567454aeea63373aa510644964eb18e1e684f30d4053c75a73506d0e947a38ca206daf847ce927ec2df15e73932278c2c73c3e20bd
-DIST invoke-1.6.0.tar.gz 367329 BLAKE2B d03c02966bd35f6a8f2945829d85075760d187b7aa8fa3bb96ab1f06de43156bb94894896882127d618efa174336c188b6cf73d11e5654e4214bda1036e2db58 SHA512 640719d576b6c655d2a1b8e2f0556b49621c846fbce26120abc818c20dc6f9445c7663b9aafe41e7e4f7f6160bd17d1678bb6912cbe13dcbaded278cc78eb824
+DIST invoke-2.2.0.tar.gz 299835 BLAKE2B 4e232d87ccaa712f964d45355b1cab076086ff076b5345e25054e0f0b75342cc70f5711bad0d7162f65202794c8a0bb45871ca61de0f56d0bcb916b55ebf3a98 SHA512 4b208a00ecc5eb2feccd01bb3f11248327ede703ddbc0456182165cdb30bdeab603ef7021c46c383cd4caf40c539e0f5c8746bd34e0eb77fc111464ea52f01b1
diff --git a/dev-python/invoke/invoke-1.6.0.ebuild b/dev-python/invoke/invoke-1.6.0.ebuild
deleted file mode 100644
index b7d7e09c3..000000000
--- a/dev-python/invoke/invoke-1.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1
-
-DESCRIPTION="Pythonic task execution"
-HOMEPAGE="https://pypi.org/project/invoke/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-# Depends on broken pytest-relaxed plugin
-RESTRICT="test"
-
-src_prepare(){
-	rm -r ./invoke/vendor/yaml2
-	eapply_user
-}
diff --git a/dev-python/invoke/invoke-1.5.0.ebuild b/dev-python/invoke/invoke-2.2.0.ebuild
similarity index 65%
rename from dev-python/invoke/invoke-1.5.0.ebuild
rename to dev-python/invoke/invoke-2.2.0.ebuild
index 14c4bf7bf..5b78384e3 100644
--- a/dev-python/invoke/invoke-1.5.0.ebuild
+++ b/dev-python/invoke/invoke-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
@@ -16,13 +16,14 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
+#FIXME: replace invoke/vendor/{ fluidity lexicon  yaml } with external packages
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
 # Depends on broken pytest-relaxed plugin
 RESTRICT="test"
 
-src_prepare(){
-	rm -r ./invoke/vendor/yaml2
-	eapply_user
-}
+#src_prepare(){
+#	rm -r ./invoke/vendor/yaml2
+#	eapply_user
+#}
diff --git a/dev-python/nassl/nassl-5.0.1.ebuild b/dev-python/nassl/nassl-5.0.1.ebuild
index eab21383a..6b72a78ce 100644
--- a/dev-python/nassl/nassl-5.0.1.ebuild
+++ b/dev-python/nassl/nassl-5.0.1.ebuild
@@ -31,7 +31,7 @@ IUSE=""
 RDEPEND=""
 #BDEPEND="app-arch/unzip"
 DEPEND="${RDEPEND}
-	dev-python/invoke[${PYTHON_USEDEP}]
+	>=dev-python/invoke-2.0.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 src_prepare() {
diff --git a/dev-python/nassl/nassl-5.1.0.ebuild b/dev-python/nassl/nassl-5.1.0.ebuild
index eab21383a..6b72a78ce 100644
--- a/dev-python/nassl/nassl-5.1.0.ebuild
+++ b/dev-python/nassl/nassl-5.1.0.ebuild
@@ -31,7 +31,7 @@ IUSE=""
 RDEPEND=""
 #BDEPEND="app-arch/unzip"
 DEPEND="${RDEPEND}
-	dev-python/invoke[${PYTHON_USEDEP}]
+	>=dev-python/invoke-2.0.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 src_prepare() {