diff --git a/requirements.txt b/requirements.txt
index adeabaf6..60d00769 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,8 @@ python-novaclient>=2.28.1,<2.33.0
 python-neutronclient>=2.6.0,!=4.1.0  # Apache-2.0
 python-heatclient>=0.6.0  # Apache-2.0
 python-glanceclient>=2.0.0  # Apache-2.0
-python-saharaclient>=0.13.0  # Apache-2.0
+python-openstackclient<3.0.0  # Apache-2.0
+python-saharaclient>=0.13.0,<=0.18.0  # Apache-2.0
 
 Babel>=1.3,!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3  # BSD
 paramiko>=1.16.0  # LGPL
@@ -24,8 +25,8 @@ alembic>=0.8.0  # MIT
 amqp>=1.4.0,<2.0 # LGPL
 anyjson>=0.3.3  # BSD
 gevent
-keystonemiddleware>=4.0.0,!=4.1.0  # Apache-2.0
-kombu>=3.0.25  # BSD
+keystonemiddleware>=4.0.0,!=4.1.0,<4.11.0 # Apache-2.0
+kombu>=3.0.25,<4.0.0  # BSD
 oslo.serialization>=1.10.0              # Apache-2.0
 oslo.utils>=3.5.0                       # Apache-2.0
 pecan>=1.0.0  # BSD