diff --git a/setup.py b/setup.py
index 6de5c4bd..3d9203aa 100755
--- a/setup.py
+++ b/setup.py
@@ -54,9 +54,10 @@ def read(*names, **kwargs):
         "loguru",
         "matplotlib >= 3.0.3",
         "oedialect",
-        # PyPSA uses a deprecated import that errors with Pyomo 6.4.3.
-        # Upstream has a fix but it's not yet released.
-        "pyomo != 6.4.3",
+        # Fix upper version limits for pyomo and pandas
+        # Related to problems with old pypsa version
+        "pandas < 2",
+        "pyomo>6.4, <6.6, !=6.4.3",
         "pypsa == 0.20.1",
         "rtree",
         "saio",