diff --git a/tools/deployment/baremetal/010-setup-client.sh b/tools/deployment/baremetal/010-setup-client.sh
index 76bfb90ca8..27da6e43cb 100755
--- a/tools/deployment/baremetal/010-setup-client.sh
+++ b/tools/deployment/baremetal/010-setup-client.sh
@@ -16,7 +16,9 @@
 
 set -xe
 
-sudo -H -E pip install python-openstackclient python-heatclient python-ironicclient
+sudo -H -E pip install \
+-c${UPPER_CONSTRAINTS_FILE:=https://releases.openstack.org/constraints/upper/master} \
+python-openstackclient python-heatclient python-ironicclient
 
 sudo -H mkdir -p /etc/openstack
 cat << EOF | sudo -H tee -a /etc/openstack/clouds.yaml
diff --git a/tools/deployment/common/setup-client.sh b/tools/deployment/common/setup-client.sh
index 60acf31ff1..bc2ab7908b 100755
--- a/tools/deployment/common/setup-client.sh
+++ b/tools/deployment/common/setup-client.sh
@@ -17,7 +17,9 @@
 set -xe
 
 sudo -H -E pip install "cmd2<=0.8.7"
-sudo -H -E pip install python-openstackclient python-heatclient --ignore-installed
+sudo -H -E pip install \
+-c${UPPER_CONSTRAINTS_FILE:=https://releases.openstack.org/constraints/upper/master} \
+python-openstackclient python-heatclient --ignore-installed
 
 sudo -H mkdir -p /etc/openstack
 sudo -H chown -R $(id -un): /etc/openstack