diff --git a/requirements-docs.txt b/requirements-docs.txt
index dfc8f8012f..b453001ffe 100644
--- a/requirements-docs.txt
+++ b/requirements-docs.txt
@@ -236,8 +236,6 @@ idna==3.3
     #   requests
 imagesize==1.3.0
     # via sphinx
-importlib-metadata==4.10.1
-    # via sphinx
 inflection==0.5.1
     # via -r requirements-docs.in
 iniconfig==1.1.1
@@ -520,7 +518,6 @@ six==1.16.0
     #   responses
     #   retrying
     #   sphinxcontrib-httpdomain
-    #   sqlalchemy-utils
 smmap==5.0.0
     # via
     #   -r requirements-tests.txt
@@ -562,7 +559,7 @@ sqlalchemy==1.3.24
     #   flask-sqlalchemy
     #   marshmallow-sqlalchemy
     #   sqlalchemy-utils
-sqlalchemy-utils==0.38.2
+sqlalchemy-utils==0.40.0
     # via -r requirements-docs.in
 sshpubkeys==3.3.1
     # via
@@ -585,9 +582,7 @@ tomli==2.0.0
 twofish==0.3.0
     # via pyjks
 typing-extensions==4.0.1
-    # via
-    #   -r requirements-tests.txt
-    #   black
+    # via -r requirements-tests.txt
 urllib3==1.26.8
     # via
     #   -r requirements-tests.txt
@@ -623,25 +618,23 @@ xmltodict==0.12.0
     #   -r requirements-docs.in
     #   -r requirements-tests.txt
     #   moto
-zipp==3.7.0
-    # via importlib-metadata
-zope.component==5.0.1
+zope-component==5.0.1
     # via
     #   -r requirements-tests.txt
     #   certbot
-zope.event==4.5.0
+zope-event==4.5.0
     # via
     #   -r requirements-tests.txt
-    #   zope.component
-zope.hookable==5.1.0
+    #   zope-component
+zope-hookable==5.1.0
     # via
     #   -r requirements-tests.txt
-    #   zope.component
-zope.interface==5.4.0
+    #   zope-component
+zope-interface==5.4.0
     # via
     #   -r requirements-tests.txt
     #   certbot
-    #   zope.component
+    #   zope-component
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements.txt b/requirements.txt
index 0f4c2ed08b..fce460b8c5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -267,7 +267,6 @@ six==1.16.0
     #   hvac
     #   python-dateutil
     #   retrying
-    #   sqlalchemy-utils
     #   validators
 soupsieve==2.3.1
     # via beautifulsoup4
@@ -278,7 +277,7 @@ sqlalchemy==1.3.24
     #   flask-sqlalchemy
     #   marshmallow-sqlalchemy
     #   sqlalchemy-utils
-sqlalchemy-utils==0.38.2
+sqlalchemy-utils==0.40.0
     # via -r requirements.in
 tabulate==0.8.9
     # via -r requirements.in
@@ -304,16 +303,16 @@ wrapt==1.13.3
     # via deprecated
 xmltodict==0.12.0
     # via -r requirements.in
-zope.component==5.0.1
+zope-component==5.0.1
     # via certbot
-zope.event==4.5.0
-    # via zope.component
-zope.hookable==5.1.0
-    # via zope.component
-zope.interface==5.4.0
+zope-event==4.5.0
+    # via zope-component
+zope-hookable==5.1.0
+    # via zope-component
+zope-interface==5.4.0
     # via
     #   certbot
-    #   zope.component
+    #   zope-component
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools