diff --git a/dev-python/aiopg/aiopg-1.4.0-r1.ebuild b/dev-python/aiopg/aiopg-1.4.0-r2.ebuild
similarity index 94%
rename from dev-python/aiopg/aiopg-1.4.0-r1.ebuild
rename to dev-python/aiopg/aiopg-1.4.0-r2.ebuild
index f874f2eda..d93b6368c 100644
--- a/dev-python/aiopg/aiopg-1.4.0-r1.ebuild
+++ b/dev-python/aiopg/aiopg-1.4.0-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # tests use docker containers -- that's wild!
 RESTRICT="test"
@@ -29,7 +29,6 @@ RDEPEND="
 "
 
 DEPEND="test? (
-	dev-python/docker-py[${PYTHON_USEDEP}]
 	dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	dev-python/sqlalchemy[${PYTHON_USEDEP}]
 )"
diff --git a/dev-python/peewee-async/Manifest b/dev-python/peewee-async/Manifest
index 1c99435b8..4a9fa2da4 100644
--- a/dev-python/peewee-async/Manifest
+++ b/dev-python/peewee-async/Manifest
@@ -1,2 +1,2 @@
-DIST peewee-async-0.8.0.tar.gz 14521 BLAKE2B 82952fe8dc0e8cbfcc6ebf16d0c750f22e069c8be9ec658f139487f2d30eb869840ceacd1460e07809ace9aceca6fc7d26b6b14d8aad931e6f9ea1aa25225b15 SHA512 94f5a6125626e76a1b0f5aa09dd565cf1e0c9440c0f966d66b8a4533e8c21e2fc440ecab97c89473a5d81da7dfc5de56cb149e9e55c05e3c42c79dbd802a3301
 DIST peewee-async-0.8.1.tar.gz 14510 BLAKE2B f758c1645513c3bdc989fa99d8d5768240bf6f64933803b55e8f401d6ff2c7b52642883bc089faa010e1e2fbbbb5747c7a3dd1b263e92a12c6a2f92c8e8206f5 SHA512 426529812f2e6b990ce16699e4c43eeefa109cc1fd6aff1e4ad1d7e647c999dd6a4abc3fd1bb2d6ba7dfdae8a6e89e668b310ee171dfa1c9d2a84b406f4d2dc4
+DIST peewee_async-0.9.1.tar.gz 13718 BLAKE2B 80cd4ed885fec3021cf4870bd4fd68fa22ffa41cca7e6c3046098c286c57900850ea08935b48e31a259f047b3587a5bcf55e9c861bfbba2aa9f2ee92d3eed5b9 SHA512 c2f5c7e4cb71944e1c9f77b7f0a3707106c1c8cc954992b6f5d9d16536c5448161e1047678b0b394bd82b6bf571484b365c91e965782ed10c867ac9d91b24f57
diff --git a/dev-python/peewee-async/peewee-async-0.8.0.ebuild b/dev-python/peewee-async/peewee-async-0.9.1.ebuild
similarity index 63%
rename from dev-python/peewee-async/peewee-async-0.8.0.ebuild
rename to dev-python/peewee-async/peewee-async-0.9.1.ebuild
index 68b94c06e..af5e8c0aa 100644
--- a/dev-python/peewee-async/peewee-async-0.8.0.ebuild
+++ b/dev-python/peewee-async/peewee-async-0.9.1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-PYPI_NO_NORMALIZE=1
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
@@ -16,10 +15,15 @@ HOMEPAGE="https://github.com/05bit/peewee-async"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
+IUSE="postgres"
+
+RDEPEND=">=dev-python/peewee-3.15.5[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-6.7.0[${PYTHON_USEDEP}]
+	postgres? ( dev-python/aiopg[${PYTHON_USEDEP}] )
+"
+#FIXME:
+#	mysql dev-python/aiomysql
+#	mysql = ["aiomysql", "cryptography"]
 
-RDEPEND=">=dev-python/peewee-3.5.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-distutils_enable_tests pytest