diff --git a/requirements.txt b/requirements.txt
index 6dbfaa761a3..a0f97433b17 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ cryptography
 dataclasses
 dnspython
 josepy
-mako
+mako<1.4.0
 numpy
 odoo_test_helper
 odoorpc
diff --git a/upgrade_analysis/__manifest__.py b/upgrade_analysis/__manifest__.py
index 79f20977313..61f5d97e10d 100644
--- a/upgrade_analysis/__manifest__.py
+++ b/upgrade_analysis/__manifest__.py
@@ -22,7 +22,9 @@
     "installable": True,
     "depends": ["base"],
     "external_dependencies": {
-        "python": ["mako", "dataclasses", "odoorpc", "openupgradelib"],
+        # Keep mako below 1.4.0 as it requires MarkupSafe >= 2.0.0 which
+        # causes dependency hell when running Odoo 16 with Python 3.10
+        "python": ["mako<1.4.0", "dataclasses", "odoorpc", "openupgradelib"],
     },
     "license": "AGPL-3",
 }