diff --git a/README.rst b/README.rst
index ada254644..4494ed5a9 100644
--- a/README.rst
+++ b/README.rst
@@ -45,7 +45,7 @@ Project status, features, and bugs are tracked on StoryBoard:
 
 Developer documentation can be found here:
 
-  https://docs.openstack.org/ironic-python-agent
+  https://docs.openstack.org/ironic-python-agent/latest/
 
 Release notes for the project are available at:
 
@@ -53,7 +53,7 @@ Release notes for the project are available at:
 
 Source code repository for the project is located at:
 
-  https://git.openstack.org/cgit/openstack/ironic-python-agent/
+  https://opendev.org/openstack/ironic-python-agent/
 
 IRC channel:
     #openstack-ironic
diff --git a/doc/source/admin/troubleshooting.rst b/doc/source/admin/troubleshooting.rst
index afe67f195..7f5efdcfc 100644
--- a/doc/source/admin/troubleshooting.rst
+++ b/doc/source/admin/troubleshooting.rst
@@ -156,7 +156,7 @@ building a custom image can be found at [3]_.
 
 This essentially boils down to the following steps:
 
-#. ``git clone https://git.openstack.org/openstack/ironic-python-agent``
+#. ``git clone https://opendev.org/openstack/ironic-python-agent``
 #. ``cd ironic-python-agent``
 #. ``pip install -r ./requirements.txt``
 #. If not installed, please install the docker container engine. [5]_
diff --git a/doc/source/contributor/metrics.rst b/doc/source/contributor/metrics.rst
index 5ff3841d1..70c0bfc6a 100644
--- a/doc/source/contributor/metrics.rst
+++ b/doc/source/contributor/metrics.rst
@@ -50,4 +50,4 @@ ship them using the provided metrics library. For example::
 References
 ==========
 For more information, please read the source of the metrics module in
-`ironic-lib <https://git.openstack.org/cgit/openstack/ironic-lib/tree/ironic_lib>`_.
+`ironic-lib <https://opendev.org/openstack/ironic-lib/src/branch/master/ironic_lib>`_.
diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst
index 451703343..df94b7ade 100644
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@@ -190,7 +190,7 @@ References
 .. [0] CoreOS PXE Images - https://coreos.com/docs/running-coreos/bare-metal/booting-with-pxe/
 .. [1] CoreOS Cloud Init - https://coreos.com/docs/cluster-management/setup/cloudinit-cloud-config/
 .. [2] DIB Element for IPA - https://docs.openstack.org/diskimage-builder/latest/elements/ironic-agent/README.html
-.. [3] cloud-config.yaml - https://git.openstack.org/cgit/openstack/ironic-python-agent/tree/imagebuild/coreos/oem/cloud-config.yml
+.. [3] cloud-config.yaml - https://opendev.org/openstack/ironic-python-agent/src/branch/master/imagebuild/coreos/oem/cloud-config.yml
 
 Indices and tables
 ==================
diff --git a/imagebuild/tinyipa/README.rst b/imagebuild/tinyipa/README.rst
index af111bc09..90a13e663 100644
--- a/imagebuild/tinyipa/README.rst
+++ b/imagebuild/tinyipa/README.rst
@@ -139,7 +139,7 @@ tinyipa::
 Using ironic-lib from source
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-`ironic-lib <https://git.openstack.org/cgit/openstack/ironic-lib>`_ contains
+`ironic-lib <https://opendev.org/openstack/ironic-lib>`_ contains
 important parts of the provisioning logic. If you need to build an IPA image
 with your local checkout of `ironic-lib`, export the following variable::