diff --git a/defaults/main.yml b/defaults/main.yml
index e994ab5..31fb40e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -44,7 +44,7 @@ gnocchi_auth_mode: "{{ (gnocchi_keystone_auth | bool) | ternary('keystone', 'bas
 # of an OpenStack-Ansible repo_server.
 gnocchi_git_repo: https://github.com/gnocchixyz/gnocchi
 gnocchi_git_install_branch: master
-gnocchi_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')) }}"
+gnocchi_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}"
 gnocchi_git_constraints:
   - "git+{{ gnocchi_git_repo }}@{{ gnocchi_git_install_branch }}#egg=gnocchi"
   - "--constraint {{ gnocchi_upper_constraints_url }}"
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 4a3db7c..2e13d99 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