diff --git a/.gitreview b/.gitreview
index d7c52c0593..529e7ec93d 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/swift.git
diff --git a/.zuul.yaml b/.zuul.yaml
index b013c31642..7ddfbe796a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -169,12 +169,12 @@
     description: |
       Setup a Swift/Keystone environment and run Swift's func tests.
     required-projects:
-      - git.openstack.org/openstack/requirements
-      - git.openstack.org/openstack/swift
-      - git.openstack.org/openstack/keystone
+      - opendev.org/openstack/requirements
+      - opendev.org/openstack/swift
+      - opendev.org/openstack/keystone
     timeout: 2700
     vars:
-      tox_constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
+      tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
       # This tox env get run twice; once for Keystone and once for tempauth
       tox_envlist: func
       devstack_localrc:
@@ -191,7 +191,7 @@
       devstack_services:
         keystone: true
         swift: true
-      zuul_work_dir: src/git.openstack.org/openstack/swift
+      zuul_work_dir: src/opendev.org/openstack/swift
     pre-run: tools/playbooks/dsvm/pre.yaml
     run: tools/playbooks/dsvm/run.yaml
     post-run: tools/playbooks/dsvm/post.yaml