diff --git a/.gitreview b/.gitreview
index 78113d225..43b1703eb 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/bifrost.git
diff --git a/playbooks/legacy/bifrost-integration-dhcp/run.yaml b/playbooks/legacy/bifrost-integration-dhcp/run.yaml
index 862ee43da..b9232ce55 100644
--- a/playbooks/legacy/bifrost-integration-dhcp/run.yaml
+++ b/playbooks/legacy/bifrost-integration-dhcp/run.yaml
@@ -2,7 +2,7 @@
   name: Autoconverted job legacy-bifrost-integration-dhcp from old job gate-bifrost-integration-dhcp-ubuntu-xenial-nv
   roles:
     - role: bindep
-      bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/bifrost'].src_dir }}"
+      bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/bifrost'].src_dir }}"
 
   tasks:
 
@@ -36,7 +36,7 @@
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              https://git.openstack.org $ZUUL_PROJECT openstack/requirements
+              https://opendev.org $ZUUL_PROJECT openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
           if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
@@ -54,12 +54,12 @@
           cd $WORKSPACE
 
           /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            https://git.openstack.org \
+            https://opendev.org \
             openstack/bifrost \
             openstack/diskimage-builder \
             openstack/ironic \
             openstack/python-ironicclient \
-            openstack-infra/shade \
+            openstack/shade \
             openstack/openstacksdk \
             openstack/ironic-inspector \
             openstack/python-ironic-inspector-client \
diff --git a/playbooks/legacy/bifrost-integration-dibipa-debian/run.yaml b/playbooks/legacy/bifrost-integration-dibipa-debian/run.yaml
index 705ac53c7..26076d50d 100644
--- a/playbooks/legacy/bifrost-integration-dibipa-debian/run.yaml
+++ b/playbooks/legacy/bifrost-integration-dibipa-debian/run.yaml
@@ -2,7 +2,7 @@
   name: Autoconverted job legacy-bifrost-integration-dibipa-debian from old job gate-bifrost-integration-dibipa-debian-ubuntu-xenial-nv
   roles:
     - role: bindep
-      bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/bifrost'].src_dir }}"
+      bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/bifrost'].src_dir }}"
 
   tasks:
 
@@ -36,7 +36,7 @@
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              https://git.openstack.org $ZUUL_PROJECT openstack/requirements
+              https://opendev.org $ZUUL_PROJECT openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
           if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
@@ -54,12 +54,12 @@
           cd $WORKSPACE
 
           /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            https://git.openstack.org \
+            https://opendev.org \
             openstack/bifrost \
             openstack/diskimage-builder \
             openstack/ironic \
             openstack/python-ironicclient \
-            openstack-infra/shade \
+            openstack/shade \
             openstack/openstacksdk \
             openstack/ironic-inspector \
             openstack/python-ironic-inspector-client \
diff --git a/playbooks/legacy/bifrost-integration-tinyipa/run.yaml b/playbooks/legacy/bifrost-integration-tinyipa/run.yaml
index 2190a5473..ed79f114d 100644
--- a/playbooks/legacy/bifrost-integration-tinyipa/run.yaml
+++ b/playbooks/legacy/bifrost-integration-tinyipa/run.yaml
@@ -2,7 +2,7 @@
   name: Autoconverted job legacy-bifrost-integration-tinyipa from old job gate-bifrost-integration-tinyipa-ubuntu-xenial
   roles:
     - role: bindep
-      bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/bifrost'].src_dir }}"
+      bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/bifrost'].src_dir }}"
 
   tasks:
 
@@ -46,7 +46,7 @@
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              https://git.openstack.org openstack/bifrost openstack/requirements
+              https://opendev.org openstack/bifrost openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
           if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
@@ -64,11 +64,11 @@
           cd $WORKSPACE
 
           /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            https://git.openstack.org \
+            https://opendev.org \
             openstack/bifrost \
             openstack/ironic \
             openstack/python-ironicclient \
-            openstack-infra/shade \
+            openstack/shade \
             openstack/openstacksdk \
             openstack/ironic-inspector \
             openstack/python-ironic-inspector-client \
diff --git a/zuul.d/legacy-bifrost-jobs.yaml b/zuul.d/legacy-bifrost-jobs.yaml
index c5e045532..87f695d66 100644
--- a/zuul.d/legacy-bifrost-jobs.yaml
+++ b/zuul.d/legacy-bifrost-jobs.yaml
@@ -18,7 +18,7 @@
       - openstack/python-ironic-inspector-client
       - openstack/python-ironicclient
       - openstack/requirements
-      - openstack-infra/shade
+      - openstack/shade
 
 - job:
     name: bifrost-integration