diff --git a/README.rst b/README.rst
index 48508495..f0966365 100644
--- a/README.rst
+++ b/README.rst
@@ -38,7 +38,7 @@ provides a Python API (the ``heatclient`` module) and a command-line tool
 .. _Launchpad project: https://launchpad.net/python-heatclient
 .. _Blueprints: https://blueprints.launchpad.net/python-heatclient
 .. _Bugs: https://storyboard.openstack.org/#!/project/openstack/python-heatclient
-.. _Source: https://git.openstack.org/cgit/openstack/python-heatclient
+.. _Source: https://opendev.org/openstack/python-heatclient
 .. _How to Contribute: https://docs.openstack.org/infra/manual/developers.html
 .. _Specs: https://specs.openstack.org/openstack/heat-specs/
-.. _Template: https://git.openstack.org/cgit/openstack/heat-templates/
+.. _Template: https://opendev.org/openstack/heat-templates/
diff --git a/doc/source/man/heat.rst b/doc/source/man/heat.rst
index 9355a80e..1d215968 100644
--- a/doc/source/man/heat.rst
+++ b/doc/source/man/heat.rst
@@ -95,4 +95,4 @@ Please ask your OpenStack operator to enable this feature.
 BUGS
 ====
 
-Heat client is hosted in Launchpad so you can view current bugs at https://bugs.launchpad.net/python-heatclient/.
+Heat client is hosted in Launchpad so you can view current bugs at https://storyboard.openstack.org/#!/project/openstack/python-heatclient.
diff --git a/tox.ini b/tox.ini
index 117ae5ff..e9a4dae5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ setenv = VIRTUAL_ENV={envdir}
 usedevelop = True
 install_command = pip install {opts} {packages}
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = find . -type f -name "*.py[c|o]" -delete
@@ -57,7 +57,7 @@ commands =
 [testenv:docs]
 basepython = python3
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
@@ -73,7 +73,7 @@ import_exceptions = heatclient._i18n
 [testenv:releasenotes]
 basepython = python3
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html