diff --git a/app-crypt/certbot-dns-rfc2136/Manifest b/app-crypt/certbot-dns-rfc2136/Manifest
index 23df502..e576716 100644
--- a/app-crypt/certbot-dns-rfc2136/Manifest
+++ b/app-crypt/certbot-dns-rfc2136/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
 DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
+DIST certbot-2.3.0.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb
 EBUILD certbot-dns-rfc2136-1.13.0.ebuild 1168 BLAKE2B dc81d001f898be52daa3fd9aeefb99abacfb84b8d5632f496ab0df5bce588caa6ff0a4e32fa0205719b03376f055e6512f0c00a95464fb3cfe07e2fe00a901ef SHA512 7b8e35497134fa356ae200ee6b800dac57fa945fb741e0f558304c0298d37590330f498b0d8d9ce1228a953a17b040bb9eda9c2183e75f4b3698743d7a4651b8
 EBUILD certbot-dns-rfc2136-1.16.0.ebuild 1164 BLAKE2B 2baaf0cf813d78c852274ff6292cc252c574d46baa9a67a5b5da0fc6fcb2a7f4db1e232347552ebf1a57f9a2b7de6809a80c2fa0725613b46ddefd709d7f9414 SHA512 544b731c80eca95427d19279606522936876c9b29de67e8581d695ce082f66054b4300e891b5df1b157a5a7813068358de51bd95a021dd65485f3767ccb8340f
 EBUILD certbot-dns-rfc2136-1.17.0.ebuild 1164 BLAKE2B 2baaf0cf813d78c852274ff6292cc252c574d46baa9a67a5b5da0fc6fcb2a7f4db1e232347552ebf1a57f9a2b7de6809a80c2fa0725613b46ddefd709d7f9414 SHA512 544b731c80eca95427d19279606522936876c9b29de67e8581d695ce082f66054b4300e891b5df1b157a5a7813068358de51bd95a021dd65485f3767ccb8340f
+EBUILD certbot-dns-rfc2136-2.3.0.ebuild 939 BLAKE2B 874126c8a8306ea94a420828638a3669ab8985dc9b286233e5bb0373e28a9ad7fa59d5d46f40a75d575ff76b1aa4878ec5e0440902a16d48f5836ae24298d256 SHA512 eb93d6161ff86f3909fcebf604ab7cb4f0621d28e1d13d023455cb9185f019e592fd662f780d056b4ba26bf329eb5e0b4cf842085063c0d31eb9c0eb43ab0999
diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.3.0.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.3.0.ebuild
new file mode 100644
index 0000000..67e9626
--- /dev/null
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-dns-rfc2136}/${PN%-dns-rfc2136}/archive/v${PV}.tar.gz -> ${PN%-dns-rfc2136}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-dns-rfc2136}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="DNS RFC 2136 plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
diff --git a/sci-electronics/vzlogger/Manifest b/sci-electronics/vzlogger/Manifest
index 4215c1d..834f870 100644
--- a/sci-electronics/vzlogger/Manifest
+++ b/sci-electronics/vzlogger/Manifest
@@ -2,4 +2,4 @@ AUX vzlogger-9999-cpp-true_false.patch 1542 BLAKE2B 52eda9cb87f12fa845d042ee26ec
 AUX vzlogger-9999-curl_tls1_2.patch 694 BLAKE2B b26f6617961aa822fec087b25f078ba293a85a19f49f486781f136907be15699a57a1decbe2367cb9eb06b86a39f0f0855412dccea5fe2963c802413d531ce68 SHA512 e304c71e644b3d732945b0cd44f24667da0b99a65691e682816d85571fd262ab5ea69842a741e942435ded45a69b8d3dbf3e5059e0feffdf661590ffdde730af
 AUX vzlogger.logrotate 71 BLAKE2B ac41e0c56cd3ddc1432635ce2ef9c6e383dab49422215b6610ebbff8890916308caf22cc6d10c86e126190dfb8d18f2c6b13f2078c7febcab7a48ca52878f6e5 SHA512 cbb813856a949bd4e11a552def0ce18e55f7127e8a03c7e5d42302f49e79bba004a9f80789f554899c7f5304b555bcc2d85ad837b00e8201550c1a642b64c17a
 AUX vzlogger.service 254 BLAKE2B 3466c9d10ef4e67382f52de0967bfd7256a872244907a5cb4a2fb14d90d26df180698d14b39430e5e8f848157a82065b12194f70b95af8e072c9f8d5db1a325a SHA512 3a0e295c2c6f8467ee070db67adb1bdfca7afd1b958fd193c83bd2f59edd10079ecff9177b098c34bed594cfc13886b15609a7665aa5ab9827223040c04de64f
-EBUILD vzlogger-9999.ebuild 2473 BLAKE2B b357d6ba733e5483ac4dc726d88f2b7362219c20ec2f5f2abdb4049bf5948742793184730872a1981ac5442df9d83f3df448de8b4cf42fe1fd891485e513e497 SHA512 d94ecfb86ef814a69d1c85d4ba5a7b9326be4ded54e786b4c4154a9f6d056966f48e978d9556c76f7db78786ca7029d9f67f65d7feb5e385c961d1317e558347
+EBUILD vzlogger-9999.ebuild 2449 BLAKE2B 010c025d3f6deb185dbfaeff1c63f76cf71626dcd0604599a1099aeb09631167b690c85a87d95903e84fe8f1b7890f043234b301d516dc88e526362f5f072182 SHA512 ef9805e707898bd1cd46dda7070da060e511d893843a76e306318632af29c2c28b3c8662e311dbc66ce4c13d131b368ed74404ab6e8c040d99a207e2e7bcc9a0
diff --git a/sci-electronics/vzlogger/vzlogger-9999.ebuild b/sci-electronics/vzlogger/vzlogger-9999.ebuild
index cfaed66..f4f1745 100644
--- a/sci-electronics/vzlogger/vzlogger-9999.ebuild
+++ b/sci-electronics/vzlogger/vzlogger-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]]; then
         EGIT_REPO_URI="https://github.com/volkszaehler/${PN}"
@@ -42,7 +42,7 @@ src_prepare() {
 
 	default
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e "s/  share\/doc\/vzlogger-\${VZLOGGER_MAJOR_VERSION}-\${VZLOGGER_MINOR_VERSION}$/  share\/doc\/vzlogger-${PV}/" \
 		-i ${S}/CMakeLists.txt \
@@ -74,11 +74,11 @@ src_configure() {
 		-DMICROHTTPD_HOME=/usr
 		-DSML_HOME=/usr
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	insinto /etc
 	doins ${S}/etc/vzlogger.conf