diff --git a/.gitreview b/.gitreview
index ac6834d1..ba2d43e7 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/ec2-api.git
diff --git a/.zuul.yaml b/.zuul.yaml
index e164f9b1..0765496b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,7 +5,7 @@
     post-run: playbooks/legacy/ec2-api-functional-neutron/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/ec2-api
       - openstack/neutron
       - openstack/neutron-tempest-plugin
@@ -18,10 +18,10 @@
     post-run: playbooks/legacy/ec2-api-functional-neutron-full/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/ec2-api
       - openstack/neutron
-      - openstack/swift3
+      - x/swift3
       - openstack/neutron-tempest-plugin
       - openstack/ec2api-tempest-plugin
 
@@ -32,7 +32,7 @@
     post-run: playbooks/legacy/ec2-api-rally-fakevirt/post.yaml
     timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/ec2-api
       - openstack/rally
 
diff --git a/playbooks/legacy/ec2-api-functional-neutron-full/run.yaml b/playbooks/legacy/ec2-api-functional-neutron-full/run.yaml
index 076b0338..ca504e5e 100644
--- a/playbooks/legacy/ec2-api-functional-neutron-full/run.yaml
+++ b/playbooks/legacy/ec2-api-functional-neutron-full/run.yaml
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -30,8 +30,8 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin ec2-api https://git.openstack.org/openstack/ec2-api
-          enable_plugin neutron-tempest-plugin https://git.openstack.org/openstack/neutron-tempest-plugin
+          enable_plugin ec2-api https://opendev.org/openstack/ec2-api
+          enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin
           TEMPEST_PLUGINS='/opt/stack/new/ec2api-tempest-plugin'
           RUN_LONG_TESTS=1
 
@@ -50,7 +50,7 @@
           export DEVSTACK_GATE_NEUTRON=1
 
           export PROJECTS="openstack/ec2-api $PROJECTS"
-          export PROJECTS="openstack/swift3 $PROJECTS"
+          export PROJECTS="x/swift3 $PROJECTS"
           export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS"
           export ENABLED_SERVICES+=,swift3
           export PROJECTS="openstack/ec2api-tempest-plugin $PROJECTS"
diff --git a/playbooks/legacy/ec2-api-functional-neutron/run.yaml b/playbooks/legacy/ec2-api-functional-neutron/run.yaml
index bc0fbb6b..12c479f1 100644
--- a/playbooks/legacy/ec2-api-functional-neutron/run.yaml
+++ b/playbooks/legacy/ec2-api-functional-neutron/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,8 +29,8 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin ec2-api https://git.openstack.org/openstack/ec2-api
-          enable_plugin neutron-tempest-plugin https://git.openstack.org/openstack/neutron-tempest-plugin
+          enable_plugin ec2-api https://opendev.org/openstack/ec2-api
+          enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin
           TEMPEST_PLUGINS='/opt/stack/new/ec2api-tempest-plugin'
 
           EOF
diff --git a/playbooks/legacy/ec2-api-rally-fakevirt/run.yaml b/playbooks/legacy/ec2-api-rally-fakevirt/run.yaml
index c6d9ee24..b52dd027 100644
--- a/playbooks/legacy/ec2-api-rally-fakevirt/run.yaml
+++ b/playbooks/legacy/ec2-api-rally-fakevirt/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,8 +29,8 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin ec2-api https://git.openstack.org/openstack/ec2-api
-          enable_plugin rally https://git.openstack.org/openstack/rally
+          enable_plugin ec2-api https://opendev.org/openstack/ec2-api
+          enable_plugin rally https://opendev.org/openstack/rally
 
           EOF
         executable: /bin/bash