diff --git a/diskimage_builder/elements/ironic-agent/README.rst b/diskimage_builder/elements/ironic-agent/README.rst
index 112caa3e..1701cc45 100644
--- a/diskimage_builder/elements/ironic-agent/README.rst
+++ b/diskimage_builder/elements/ironic-agent/README.rst
@@ -2,7 +2,7 @@
 ironic-agent
 ============
 Builds a ramdisk with ironic-python-agent.  More information can be found at:
-    https://git.openstack.org/cgit/openstack/ironic-python-agent/
+    https://opendev.org/openstack/ironic-python-agent/
 
 Beyond installing the ironic-python-agent, this element does the following:
 
diff --git a/diskimage_builder/elements/pypi/README.rst b/diskimage_builder/elements/pypi/README.rst
index ecdf1ad9..0a309cd5 100644
--- a/diskimage_builder/elements/pypi/README.rst
+++ b/diskimage_builder/elements/pypi/README.rst
@@ -35,7 +35,7 @@ export DIB\_PYPI\_MIRROR\_URL\_1=http://site/pypi/
 export DIB\_PYPI\_MIRROR\_URL\_2=file:///tmp/pypi
 export DIB\_PIP\_RETRIES=0
 
-[devpi-server](https://git.openstack.org/cgit/openstack-infra/pypi-mirro://pypi.python.org/pypi/devpi-server)
+[devpi-server](https://pypi.python.org/pypi/devpi-server)
 can be useful in making a partial PyPI mirror suitable for building images. For
 instance:
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index db1aaecf..552b4841 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -26,8 +26,8 @@ Release notes for the latest and previous versions are available at:
 
 The code is available at:
 
-* `https://git.openstack.org/cgit/openstack/diskimage-builder/
-  <https://git.openstack.org/cgit/openstack/diskimage-builder/>`__
+* `https://opendev.org/openstack/diskimage-builder/
+  <https://opendev.org/openstack/diskimage-builder/>`__
 
 
 Issues
diff --git a/tox.ini b/tox.ini
index 8124cefe..71646ad6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ skipsdist = True
 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://opendev.org/openstack/requirements/plain/upper-constraints.txt}
       -r{toxinidir}/requirements.txt
       -r{toxinidir}/test-requirements.txt
 commands=