diff --git a/defaults/main.yml b/defaults/main.yml
index 3e2c5b2..3a2cbfa 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -113,9 +113,9 @@ barbican_api_audit_map_overrides: {}
 barbican_vassals_api_overrides: {}
 
 ## The git source/branch
-barbican_git_repo: "https://git.openstack.org/openstack/barbican"
+barbican_git_repo: "https://opendev.org/openstack/barbican"
 barbican_git_install_branch: master
-barbican_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')) }}"
+barbican_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}"
 barbican_git_constraints:
   - "git+{{ barbican_git_repo }}@{{ barbican_git_install_branch }}#egg=barbican"
   - "--constraint {{ barbican_upper_constraints_url }}"
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 009fab2..1f1d698 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
diff --git a/tests/os_barbican-overrides.yml b/tests/os_barbican-overrides.yml
index 5da8623..d46444f 100644
--- a/tests/os_barbican-overrides.yml
+++ b/tests/os_barbican-overrides.yml
@@ -28,7 +28,7 @@ tempest_run: yes
 
 tempest_plugins:
   - name: barbican-tempest-plugin
-    repo: https://git.openstack.org/openstack/barbican-tempest-plugin
+    repo: https://opendev.org/openstack/barbican-tempest-plugin
     branch: master
 
 tempest_test_whitelist: