diff --git a/.zuul.yaml b/.zuul.yaml
index dd172d3..3b46568 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,8 +1,6 @@
 - project:
     templates:
       - openstack-cover-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
       - openstack-python3-zed-jobs
     check:
       jobs:
@@ -21,10 +19,6 @@
             irrelevant-files: *refstack-client-irrelevant-files
         - refstack-client-devstack-victoria:
             irrelevant-files: *refstack-client-irrelevant-files
-        - refstack-client-devstack-ussuri:
-            irrelevant-files: *refstack-client-irrelevant-files
-        - refstack-client-devstack-train:
-            irrelevant-files: *refstack-client-irrelevant-files
         - opendev-tox-docs
     gate:
       jobs:
@@ -38,10 +32,6 @@
             irrelevant-files: *refstack-client-irrelevant-files
         - refstack-client-devstack-victoria:
             irrelevant-files: *refstack-client-irrelevant-files
-        - refstack-client-devstack-ussuri:
-            irrelevant-files: *refstack-client-irrelevant-files
-        - refstack-client-devstack-train:
-            irrelevant-files: *refstack-client-irrelevant-files
         - opendev-tox-docs
     promote:
       jobs:
diff --git a/README.rst b/README.rst
index 4899c98..69d4fd1 100644
--- a/README.rst
+++ b/README.rst
@@ -26,11 +26,11 @@ We've created an "easy button" for Ubuntu, Centos, RHEL and openSUSE.
 
    b. -t option allows to specify tag in Tempest repository which will be installed.
    For example: execute ``./setup_env -t tags/3`` to install Tempest tag-3.
-   By default, Tempest will be installed from commit
-   1d500e79156ada6bc6fdb628ed1da0efd4121f6a (Oct, 2019).
+   By default, Tempest 31.1.0 will be installed from commit
+   56d259dd78cc9ae974cc5dc24a54dbd8008770e6 (June 2022).
 
-   c. -p option allows to specify python version - python 2.7 (-p 2), 3.6 (-p 3)
-   or any specific one by -p X.X.X. Default to python 3.6.
+   c. -p option allows to specify python version - python 2.7 (-p 2), 3.8.10 (-p 3)
+   or any specific one by -p X.X.X. Default to python 3.8.10.
 
    d. -q option makes ``refstack-client`` run quitely - if ``.tempest``
    directory exists ``refstack-client`` is considered as installed.
diff --git a/etc/accounts.yaml.sample b/etc/accounts.yaml.sample
index ddaf29c..7b7e2c6 100644
--- a/etc/accounts.yaml.sample
+++ b/etc/accounts.yaml.sample
@@ -1,7 +1,7 @@
 # A minimal accounts.yaml file
 # Will likely not work with swift, since additional
 # roles are required. For more documentation see:
-# https://git.openstack.org/cgit/openstack/tempest/tree/etc/accounts.yaml.sample
+# https://opendev.org/openstack/tempest/src/branch/master/etc/accounts.yaml.sample
 
 - username: '$USERNAME'
   project_name: '$PROJECTNAME'
diff --git a/setup_env b/setup_env
index 94e4e5a..3b45878 100755
--- a/setup_env
+++ b/setup_env
@@ -1,9 +1,10 @@
 #!/bin/bash -x
 
-#Default Tempest commit: SHA 1d500e79156ada6bc6fdb628ed1da0efd4121f6a (Oct 2019)
-CHECKOUT_POINT=1d500e79156ada6bc6fdb628ed1da0efd4121f6a
-PY_VERSION="3.6.0"
-UPPER_CONSTRAINTS_FILE="https://releases.openstack.org/constraints/upper/master"
+# Default Tempest commit:
+# SHA 56d259dd78cc9ae974cc5dc24a54dbd8008770e6 (June 2022) Tag 31.1.0
+CHECKOUT_POINT=56d259dd78cc9ae974cc5dc24a54dbd8008770e6
+PY_VERSION="3.8.10"
+UPPER_CONSTRAINTS_FILE="https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt"
 
 # Prints help
 function usage {
@@ -15,8 +16,8 @@ function usage {
     echo "  -h  Print this usage message"
     echo "  -c  Tempest test runner commit. You can specify SHA or branch here"
     echo "      If no commit or tag is specified, tempest will be install from commit"
-    echo "  -p  [ 2 | 3 | X.X.X ] - Uses either python 2.7 (if -p 2), 3.6 (if -p 3)"
-    echo "      or given specific version (if -p X.X.X). Default to python 3.6"
+    echo "  -p  [ 2 | 3 | X.X.X ] - Uses either python 2.7 (if -p 2), 3.8.10 (if -p 3)"
+    echo "      or given specific version (if -p X.X.X). Default to python 3.8.10"
     echo "  -q  Run quietly. If .tempest folder exists, refstack-client is considered as installed"
     echo "  -s  Use python-tempestconf from the given source (path), used when running f.e. in Zuul"
     echo "  -t  Tempest test runner tag. You can specify tag here"
@@ -131,10 +132,10 @@ else
 fi
 
 if [ -z ${TEMPESTCONF_SOURCE} ]; then
-    git clone https://git.openstack.org/openinfra/python-tempestconf.git ${TEMPESTCONF_DIR}
+    git clone https://opendev.org/openinfra/python-tempestconf.git ${TEMPESTCONF_DIR}
 fi
 
-git clone https://git.openstack.org/openstack/tempest.git ${TEMPEST_DIR}
+git clone https://opendev.org/openstack/tempest.git ${TEMPEST_DIR}
 cd ${TEMPEST_DIR}
 
 git checkout $CHECKOUT_POINT || if [ $? -ne 0 ]; then exit 1; fi
diff --git a/tox.ini b/tox.ini
index 5f48b69..c1885fd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
          OS_TEST_PATH=./refstack_client/tests/unit
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       git+https://git.openstack.org/openinfra/python-tempestconf@master#egg=python_tempestconf
+       git+https://opendev.org/openinfra/python-tempestconf@master#egg=python_tempestconf
 commands =
   stestr run {posargs}