diff --git a/README.rst b/README.rst
index 5b22dc61..122db126 100644
--- a/README.rst
+++ b/README.rst
@@ -39,5 +39,5 @@ References
 * Free software: Apache License, Version 2.0
 * Documentation: https://docs.openstack.org/openstackdocstheme/latest/
 * Release notes: https://docs.openstack.org/releasenotes/openstackdocstheme/
-* Source: https://git.openstack.org/cgit/openstack/openstackdocstheme
+* Source: https://opendev.org/openstack/openstackdocstheme
 * Bugs: https://launchpad.net/openstack-doc-tools
diff --git a/bin/docstheme-build-translated.sh b/bin/docstheme-build-translated.sh
index 246e4e6a..344ec7ac 100755
--- a/bin/docstheme-build-translated.sh
+++ b/bin/docstheme-build-translated.sh
@@ -168,7 +168,7 @@ for locale in `find ${DIRECTORY}/source/locale/ -maxdepth 1 -type d` ; do
 
         # Note that this is the counterpart to how we push
         # translations to the server. The code lives in
-        # http://git.openstack.org/cgit/openstack-infra/openstack-zuul-jobs/tree/roles/prepare-zanata-client/files/common_translation_update.sh
+        # https://opendev.org/openstack/openstack-zuul-jobs/src/roles/prepare-zanata-client/files/common_translation_update.sh
         # in function extract_messages_doc:
         # While Sphinx generates a single pot file per source file in the top
         # directory, is generates a file per directory for any subdirectory.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 76652f81..76510c96 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -49,7 +49,8 @@ Using the theme
 
      html_theme = 'openstackdocs'
 
-#. Set the options to link to the git repository and bug tracker.
+#. Set the options to link to the git repository on
+   ``https://opendev.org`` and bug tracker.
 
    ``repository_name``
        The prefix and repo name. For example,
@@ -82,7 +83,7 @@ Using the theme
    One example for a project using StoryBoard::
 
       # openstackdocstheme options
-      repository_name = 'openstack-infra/infra-manual'
+      repository_name = 'openstack/infra-manual'
       use_storyboard = True
 
 #. Remove the options that will be automatically configured by the theme.
diff --git a/openstackdocstheme/ext.py b/openstackdocstheme/ext.py
index fc015547..eaa1fe43 100644
--- a/openstackdocstheme/ext.py
+++ b/openstackdocstheme/ext.py
@@ -28,7 +28,7 @@ from openstackdocstheme import paths
 
 _series = None
 _project = None
-_giturl = 'https://git.openstack.org/cgit/{}/tree/{}'
+_giturl = 'https://opendev.org/{}/src/{}'
 _html_context_data = None
 
 logger = logging.getLogger(__name__)
diff --git a/openstackdocstheme/theme/openstackdocs/static/js/docs.js b/openstackdocstheme/theme/openstackdocs/static/js/docs.js
index 17dad4dc..64f380d2 100644
--- a/openstackdocstheme/theme/openstackdocs/static/js/docs.js
+++ b/openstackdocstheme/theme/openstackdocs/static/js/docs.js
@@ -102,7 +102,7 @@ $('div.deprecated > p').prepend('<div class="fa fa-fw fa-minus-circle">&nbsp;</d
    the index of the HTML element that we are modifying)                 */
 
 // Gives the log a bug icon the information it needs to generate the bug in
-// Launchpad with pre-filled information such as git SHA, git.openstack.org
+// Launchpad with pre-filled information such as git SHA, opendev.org
 // source URL, published document URL and tag.
 function logABug(bugTitle, bugProject, fieldComment, fieldTags, repositoryName, useStoryboard) {
 
diff --git a/releasenotes/notes/opendev-5c528b2b4c737d59.yaml b/releasenotes/notes/opendev-5c528b2b4c737d59.yaml
new file mode 100644
index 00000000..bdadc4d9
--- /dev/null
+++ b/releasenotes/notes/opendev-5c528b2b4c737d59.yaml
@@ -0,0 +1,4 @@
+other:
+  - |
+    The rendered git URL now uses ``https://opendev.org`` as git
+    repository URLs.
diff --git a/tox.ini b/tox.ini
index 97f2dfd4..58807926 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ envlist = pep8
 usedevelop = False
 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/raw/upper-constraints.txt}
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt