diff --git a/REVIEWING.rst b/REVIEWING.rst
index 07d668084b..36ccdb3af7 100644
--- a/REVIEWING.rst
+++ b/REVIEWING.rst
@@ -51,7 +51,7 @@ enabled for Big Tent projects.
 Removing check-requirements job
 ===============================
 
-* The http://git.openstack.org/cgit/openstack/requirements repository holds
+* The https://opendev.org/openstack/requirements repository holds
   list of projects that have check-requirements job in <root>/projects.txt.
 
 * Whenever a review is submitted for removing check-requirements job,
diff --git a/grafana/nodepool-dib.base.template b/grafana/nodepool-dib.base.template
index 5254d7192c..1bcba793a3 100644
--- a/grafana/nodepool-dib.base.template
+++ b/grafana/nodepool-dib.base.template
@@ -16,6 +16,6 @@ dashboard:
           content: |
             **This dashboard is managed by [Grafyaml](http://docs.openstack.org/infra/system-config/grafyaml.html).**
 
-            If you would like to make changes to this dashboard, please see the grafana directory in [project-config](https://git.openstack.org/cgit/openstack-infra/project-config/tree/grafana/afs.yaml).
+            If you would like to make changes to this dashboard, please see the grafana directory in [project-config](https://opendev.org/openstack/project-config/src/branch/master/grafana/afs.yaml).
           type: text
 
diff --git a/grafana/nodepool.template b/grafana/nodepool.template
index c7a48491ba..6e81c68326 100644
--- a/grafana/nodepool.template
+++ b/grafana/nodepool.template
@@ -24,7 +24,7 @@ dashboard:
 
             **This dashboard is managed by [Grafyaml](http://docs.openstack.org/infra/system-config/grafyaml.html).**
             If you would like to make changes to this dashboard, please see the template in the `grafana` directory in
-            [project-config](https://git.openstack.org/cgit/openstack-infra/project-config/tree/grafana/nodepool.template).
+            [project-config](https://opendev.org/openstack/project-config/src/branch/master/grafana/nodepool.template).
 
           type: text
 
diff --git a/tools/check_valid_gerrit_projects.py b/tools/check_valid_gerrit_projects.py
index bb96dd25e7..e159445192 100755
--- a/tools/check_valid_gerrit_projects.py
+++ b/tools/check_valid_gerrit_projects.py
@@ -164,7 +164,7 @@ def main():
         # but not git@
         upstream = p.get('upstream')
         if upstream and 'track-upstream' not in p.get('options', []):
-            openstack_repo = 'https://git.openstack.org/%s' % name
+            openstack_repo = 'https://opendev.org/%s' % name
             try:
                 # Check to see if we have already imported the project into
                 # OpenStack, if so skip checking upstream.
diff --git a/tox.ini b/tox.ini
index ecedcd27c4..c9f0d90f23 100644
--- a/tox.ini
+++ b/tox.ini
@@ -90,7 +90,7 @@ ignore = E125,E129,E402,H,W503
 
 [testenv:grafyaml]
 deps =
-  {env:GRAFYAML_SRC:git+https://git.openstack.org/openstack-infra/grafyaml#egg=grafyaml}
+  {env:GRAFYAML_SRC:git+https://opendev.org/opendev/grafyaml#egg=grafyaml}
 basepython = python2.7
 commands = grafana-dashboard validate grafana
 
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index be9887e645..118bf8fa09 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,7 +1,7 @@
 # Shared zuul config specific to the OpenStack Project
 # Contains definitions of trusted jobs
 # Overrides jobs from:
-#    https://opendev.org/cgit/zuul/zuul-jobs
+#    https://opendev.org/zuul/zuul-jobs
 
 - job:
     name: base-minimal
diff --git a/zuul/site-variables.yaml b/zuul/site-variables.yaml
index 6f3eb5e7a2..5e17862bd5 100644
--- a/zuul/site-variables.yaml
+++ b/zuul/site-variables.yaml
@@ -1,7 +1,7 @@
 # This file contains ansible variables that are used by our zuul-executors.
 ---
 zuul_site_mirror_fqdn: "mirror.{{ nodepool.region | lower }}.{{ nodepool.cloud | lower }}.openstack.org"
-zuul_site_traceroute_host: git.openstack.org
+zuul_site_traceroute_host: opendev.org
 zuul_site_image_manifest_files:
   - /etc/dib-builddate.txt
   - /etc/image-hostname.txt