diff --git a/README.rst b/README.rst
index 1153b45..b075eea 100644
--- a/README.rst
+++ b/README.rst
@@ -43,4 +43,4 @@ Then:
 .. _stestr: https://stestr.readthedocs.io/
 .. _Tox: https://tox.readthedocs.io/en/latest/
 .. _Sphinx: http://www.sphinx-doc.org/en/master/
-.. _hacking: https://git.openstack.org/cgit/openstack-dev/hacking/plain/HACKING.rst
+.. _hacking: https://opendev.org/openstack/hacking/
diff --git a/{{cookiecutter.repo_name}}/README.rst b/{{cookiecutter.repo_name}}/README.rst
index 3eb1efd..f560a30 100644
--- a/{{cookiecutter.repo_name}}/README.rst
+++ b/{{cookiecutter.repo_name}}/README.rst
@@ -10,7 +10,7 @@ Note that this is a hard requirement.
 
 * Free software: Apache license
 * Documentation: https://docs.openstack.org/{{ cookiecutter.repo_name }}/latest
-* Source: https://git.openstack.org/cgit/{{cookiecutter.repo_group}}/{{ cookiecutter.repo_name }}
+* Source: https://opendev.org/{{cookiecutter.repo_group}}/{{ cookiecutter.repo_name }}
 {%- if cookiecutter.bug_tracker == 'Launchpad' -%}
 * Bugs: https://bugs.launchpad.net/{{ cookiecutter.bug_project }}
 {%- elif cookiecutter.bug_tracker == 'Storyboard' -%}
diff --git a/{{cookiecutter.repo_name}}/tox.ini b/{{cookiecutter.repo_name}}/tox.ini
index b4b62d6..6aba6e5 100644
--- a/{{cookiecutter.repo_name}}/tox.ini
+++ b/{{cookiecutter.repo_name}}/tox.ini
@@ -5,14 +5,15 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
    OS_STDOUT_CAPTURE=1
    OS_STDERR_CAPTURE=1
    OS_TEST_TIMEOUT=60
-deps = -r{toxinidir}/test-requirements.txt
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+       -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]