diff --git a/defaults/main.yml b/defaults/main.yml
index 8c3098eb..bb9bd943 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -28,9 +28,9 @@ cinder_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_p
 cinder_install_method: "source"
 cinder_venv_python_executable: "{{ openstack_venv_python_executable | default('python2') }}"
 
-cinder_git_repo: https://git.openstack.org/openstack/cinder
+cinder_git_repo: https://opendev.org/openstack/cinder
 cinder_git_install_branch: master
-cinder_upper_constraints_url: "{{ requirements_git_url | default('https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=' ~ requirements_git_install_branch | default('master')) }}"
+cinder_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}"
 cinder_git_constraints:
   - "git+{{ cinder_git_repo }}@{{ cinder_git_install_branch }}#egg=cinder"
   - "--constraint {{ cinder_upper_constraints_url }}"
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index bd09cb60..829d6670 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -64,7 +64,7 @@ title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role'
 
 # The link to the browsable source code (for the left hand menu)
 oslosphinx_cgit_link = (
-    'https://git.openstack.org/cgit/openstack/{}'.format(target_name)
+    'https://opendev.org/openstack/{}'.format(target_name)
 )
 
 # Release notes do not need a version number in the title, they