diff --git a/tools/deployment/common/setup-client.sh b/tools/deployment/common/setup-client.sh
index 395054b5e3..ad6f511b43 100755
--- a/tools/deployment/common/setup-client.sh
+++ b/tools/deployment/common/setup-client.sh
@@ -15,7 +15,7 @@
 set -xe
 
 sudo -H -E pip3 install \
-  -c${UPPER_CONSTRAINTS_FILE:=https://releases.openstack.org/constraints/upper/master} \
+  -c${UPPER_CONSTRAINTS_FILE:=https://releases.openstack.org/constraints/upper/${OPENSTACK_RELEASE}} \
   cmd2 python-openstackclient python-heatclient --ignore-installed
 
 sudo -H mkdir -p /etc/openstack