diff --git a/app-crypt/certbot-dns-rfc2136/Manifest b/app-crypt/certbot-dns-rfc2136/Manifest
index ccc3c85..ed201d4 100644
--- a/app-crypt/certbot-dns-rfc2136/Manifest
+++ b/app-crypt/certbot-dns-rfc2136/Manifest
@@ -1 +1 @@
-DIST certbot-1.10.1.tar.gz 1416402 BLAKE2B e00ba6bf69dbf4bc91be325d4c9ba470214aeef18b4ad4ac5efbf7d077ffa9498e9cff2eff00045bc1024930f95ec56e1773c3a193a982b393caf7ee19f8ccc0 SHA512 332e92dd7d91b9774e55ef8d2c0217a57167a26d1e86d36196fc601b4abb23f40033f94112c4b4bff5f8bc54e1e32ecd68b1f01e7d67bc4fd8f7dd98ce0362cc
+DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.10.1.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.18.0.ebuild
similarity index 79%
rename from app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.10.1.ebuild
rename to app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.18.0.ebuild
index cf1f042..e8b8fa1 100644
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.10.1.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.18.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_8,3_9})
+
+PYTHON_COMPAT=(python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
@@ -25,7 +26,9 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
index 737f11e..e8b8fa1 100644
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_8,3_9})
+
+PYTHON_COMPAT=(python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
@@ -25,7 +26,9 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest