diff --git a/README.rst b/README.rst
index 3dc3379b..7fd3f8a8 100644
--- a/README.rst
+++ b/README.rst
@@ -99,4 +99,4 @@ Release Notes
 Repository
 ==========
 
-* https://git.openstack.org/cgit/openstack/training-guides
+* https://opendev.org/openstack/training-guides
diff --git a/doc/upstream-training/source/slides/code-devstack.rst b/doc/upstream-training/source/slides/code-devstack.rst
index 682d24dd..4978e08d 100644
--- a/doc/upstream-training/source/slides/code-devstack.rst
+++ b/doc/upstream-training/source/slides/code-devstack.rst
@@ -21,7 +21,7 @@ DevStack
   - from git master by default
   - from stable branches by configuration, e.g. stable/newton
 
-- Documentation: https://docs.openstack.org/developer/devstack/
+- Documentation: https://docs.openstack.org/devstack/
 
 DevStack Clone and Setup
 ========================
@@ -29,7 +29,7 @@ DevStack Clone and Setup
 
 .. code-block:: console
 
-  git clone https://git.openstack.org/openstack-dev/devstack
+  git clone https://opendev.org/openstack/devstack
 
 - Make any local configurations changes (set passwords, IP addresses, etc.)
 
diff --git a/doc/upstream-training/source/slides/docs.rst b/doc/upstream-training/source/slides/docs.rst
index 93cbb0f1..93477a1d 100644
--- a/doc/upstream-training/source/slides/docs.rst
+++ b/doc/upstream-training/source/slides/docs.rst
@@ -30,12 +30,12 @@ Documentation team structure
 
   - API, Contributor Guide, Security Guide, Training Guides, Training Labs
 
-- `Docs cores <https://review.openstack.org/#/admin/groups/30,members>`_
-  and separate core teams for `docs-specs <https://review.openstack.org/#/admin/groups/384,members>`_
-  , `contributor-guide <https://review.openstack.org/#/admin/groups/1841,members>`_
-  , `security-doc <https://review.openstack.org/#/admin/groups/347,members>`_
-  , `training-guides <https://review.openstack.org/#/admin/groups/360,members>`_
-  , and `training-labs <https://review.openstack.org/#/admin/groups/1118,members>`_
+- `Docs cores <https://review.opendev.org/#/admin/groups/30,members>`_
+  and separate core teams for `docs-specs <https://review.opendev.org/#/admin/groups/384,members>`_
+  , `contributor-guide <https://review.opendev.org/#/admin/groups/1841,members>`_
+  , `security-doc <https://review.opendev.org/#/admin/groups/347,members>`_
+  , `training-guides <https://review.opendev.org/#/admin/groups/360,members>`_
+  , and `training-labs <https://review.opendev.org/#/admin/groups/1118,members>`_
 
 - `Documentation cross-project liaisons <https://wiki.openstack.org/wiki/CrossProjectLiaisons#Documentation>`_
   for questions, reviews, doc bug triaging, and patching docs
@@ -46,7 +46,7 @@ Repositories
 - `Official deliverables with repositories <https://governance.openstack.org/tc/reference/projects/documentation.html#deliverables>`_
 - Project repos have installation tutorials and developer documentation
 
-  - Example: `Heat repository <https://git.openstack.org/cgit/openstack/heat/tree/>`_
+  - Example: `Heat repository <https://opendev.org/openstack/heat/>`_
 
     - `Developer documentation <https://docs.openstack.org/heat/>`_
       is published from doc directory in master branch
diff --git a/doc/upstream-training/source/slides/workflow-training-contribution-process.rst b/doc/upstream-training/source/slides/workflow-training-contribution-process.rst
index dd3741e2..165060ca 100644
--- a/doc/upstream-training/source/slides/workflow-training-contribution-process.rst
+++ b/doc/upstream-training/source/slides/workflow-training-contribution-process.rst
@@ -13,13 +13,13 @@ Getting to Know Your Project
 
 .. code-block:: console
 
-   $ git clone https://git.openstack.org/openstack/<your_project>
+   $ git clone https://opendev.org/openstack/<your_project>
 
 - Example:
 
 .. code-block:: console
 
-   $ git clone https://git.openstack.org/openstack/training-guides
+   $ git clone https://opendev.org/openstack/training-guides
 
 - Run the tests
 - Join the project's IRC channel
diff --git a/labs/README.md b/labs/README.md
index d30fbeef..3adbd1a4 100644
--- a/labs/README.md
+++ b/labs/README.md
@@ -4,5 +4,5 @@ Training Labs
 Training labs has its own repository.
 
 
-Repository: https://git.openstack.org/cgit/openstack/training-labs
+Repository: https://opendev.org/openstack/training-labs
 Wiki: https://wiki.openstack.org/wiki/Documentation/training-labs
diff --git a/specs/template.rst b/specs/template.rst
index ad2fcf60..92d6c154 100644
--- a/specs/template.rst
+++ b/specs/template.rst
@@ -127,7 +127,7 @@ Each API method which is either added or changed should have the following
   think about when defining their policy.
 
 Example JSON schema definitions can be found in the Nova tree
-http://git.openstack.org/cgit/openstack/nova/tree/nova/api/openstack/compute/schemas/v3
+http://opendev.org/openstack/nova/src/nova/api/openstack/compute/schemas/v3
 
 Note that the schema should be defined as restrictively as
 possible. Parameters which are required should be marked as such and