diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 49e00b4..14631ba 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -18,4 +18,4 @@ Bugs should be filed on StoryBoard, not GitHub:
 
 The code is hosted at:
 
-   https://git.openstack.org/cgit/openstack/os-traits
+   https://opendev.org/openstack/os-traits
diff --git a/HACKING.rst b/HACKING.rst
index 8695392..1d45482 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,4 +1,4 @@
 os-traits Style Commandments
-===============================================
+============================
 
 Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/
diff --git a/README.rst b/README.rst
index 5b3d6d8..335f8f7 100644
--- a/README.rst
+++ b/README.rst
@@ -4,13 +4,13 @@ os-traits
 
 `os-traits` is a library containing standardized trait strings.
 
-Traits are strings that represent a feature of some resource provider.  This
+Traits are strings that represent a feature of some resource provider. This
 library contains the catalog of constants that have been standardized in the
 OpenStack community to refer to a particular hardware, virtualization, storage,
 network, or device trait.
 
 * Free software: Apache license
 * Documentation: https://docs.openstack.org/os-traits/latest/
-* Source: http://git.openstack.org/cgit/openstack/os-traits
+* Source: http://opendev.org/openstack/os-traits
 * Bugs: https://storyboard.openstack.org/#!/project/openstack/os-traits
 * Release Notes: https://docs.openstack.org/releasenotes/os-traits
diff --git a/tox.ini b/tox.ini
index b6734a5..c2259bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ install_command = pip install {opts} {packages}
 whitelist_externals =
   rm
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
   -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
@@ -22,7 +22,7 @@ commands = {posargs}
 [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://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
   -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf doc/build