diff --git a/install-deps.sh b/install-deps.sh
index 0520d135e..bc28be08e 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -35,6 +35,14 @@ python_cmd() {
                 distribution="CentOS"
                 if [ "$distribution_major_version" -ge "8" ]; then
                     PYTHON_CMD=python3
+                elif [ "$distribution_major_version" -eq "7" ]; then
+                    release_val=$(cat /etc/centos-release | awk '{print $4 }' | grep '^7.8\|^7.9')
+                    python_val=$(rpm -q python3)
+                    if [ ! -z $release_val ] && [[ $python_val =~ "python3-" ]]; then
+                        # declare centos7 python3 variable:
+                        centos7py3=true
+                        PYTHON_CMD=python3
+                    fi
                 fi
                 ;;
             fedora)
@@ -107,19 +115,23 @@ install_deps () {
     sudo -n true && passwordless_sudo="1" || passwordless_sudo="0"
     if [[ "$passwordless_sudo" == "1" ]] || [ "$USER_OVERRIDE_SUDO_CHECK" == "1" ]; then
         if [ "$(python_cmd)" == "python3" ]; then
+            echo "setting up for python3"
             # possible bug in ansible, f29 python 3 env fails
             # w/o both python-libselinux packages installed
             # https://bugs.launchpad.net/tripleo/+bug/1812324
             PYTHON_PACKAGES+=("python3-libselinux")
             PYTHON_PACKAGES+=("python3-PyYAML")
             SETUPTOOLS_PACKAGE=python3-setuptools
-            VIRTUALENV_PACKAGE=python3-virtualenv
+            if [ -z $centos7py3 ]; then
+                VIRTUALENV_PACKAGE=python3-virtualenv
+            fi
             PIP_PACKAGE=python3-pip
-            if [ -e "/usr/bin/pip3" ] && [ ! -e "/usr/bin/pip" ]; then
+            if [ -e "/usr/bin/pip3" ]; then
                 # centos-8 installs pip as pip3
                 sudo alternatives --install /usr/bin/pip pip /usr/bin/pip3 1
             fi
         else
+            echo "setting up for python2"
             PYTHON_PACKAGES+=("libselinux-python")
             SETUPTOOLS_PACKAGE=python2-setuptools
             VIRTUALENV_PACKAGE=python2-virtualenv
@@ -129,8 +141,14 @@ install_deps () {
         $VIRTUALENV_PACKAGE $PIP_PACKAGE" | tr -s [:space:]
         sudo $(package_manager) install $PYTHON_PACKAGES \
                                             $SETUPTOOLS_PACKAGE \
-                                            $VIRTUALENV_PACKAGE \
                                             $PIP_PACKAGE
+        # Install python3 virtualenv via pip on CentOS7
+        if [ -z $centos7py3 ]; then
+            sudo $(package_manager) install $VIRTUALENV_PACKAGE
+        else
+            sudo pip3 install virtualenv
+            sudo $(package_manager) install gcc python3-devel
+        fi
         check_python_module virtualenv &> /dev/null || \
             PYTHON_PACKAGES+=($VIRTUALENV_PACKAGE)
 
diff --git a/quickstart.sh b/quickstart.sh
index c85e3cf3c..9d739305d 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -136,11 +136,22 @@ bootstrap () {
             export PIP_CONSTRAINT=${PIP_CONSTRAINT:-https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt}
         fi
         $(python_cmd) setup.py install egg_info --egg-base $OPT_WORKDIR
-        if [ $OPT_CLEAN == 1 ]; then
-            $(python_cmd) -m pip install --no-cache-dir --force-reinstall "${OPT_REQARGS[@]}"
+
+        if  [ $OPT_RELEASE == "queens" ] || [ ! -z $centos7py3 ]; then
+            # Nb: We set upper constraints to stable/train for Queens and py3
+            echo "Set upper_contratints to stable/train for Queens release and Python3"
+            export UPPER_CONSTRAINTS_FILE="https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt"
+            export PIP_CONSTRAINT="https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt"
+            $(python_cmd) -m pip install --force-reinstall pbr==5.4.3
+            $(python_cmd) -m pip install "${OPT_REQARGS[@]}"
         else
-            $(python_cmd) -m pip install --force-reinstall "${OPT_REQARGS[@]}"
+            if [ $OPT_CLEAN == 1 ]; then
+                $(python_cmd) -m pip install --no-cache-dir --force-reinstall "${OPT_REQARGS[@]}"
+            else
+                $(python_cmd) -m pip install --force-reinstall "${OPT_REQARGS[@]}"
+            fi
         fi
+
         if [ -x "$ZUUL_CLONER" ] && [ ! -z "$ZUUL_BRANCH" ]; then
                 # pull in tripleo-quickstart-extras from source
                 $ZUUL_CLONER --cache-dir \
diff --git a/requirements.txt b/requirements.txt
index 25bbbd7fe..86aa24f75 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ ansible>=2.9,<2.10
 jmespath
 netaddr>=0.7.18
 os-client-config
-pbr>=1.6
+pbr>=5.4.3
 setuptools>=11.3
 warlock!=1.3.2
 futurist<=1.10.0;python_version=='2.7' # Apache-2.0