diff --git a/.gitreview b/.gitreview
index 955af452f..fbbb9cff8 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/barbican.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 8d7d485a9..3ada02fcb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,7 +8,7 @@
       python_version: py27
       services: tempest,rabbit,mysql,key
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/barbican
       - openstack/barbican-tempest-plugin
       - openstack/python-barbicanclient
@@ -24,8 +24,8 @@
       python_version: py27
       services: tempest,keystone
     required-projects:
-      - openstack-dev/devstack
-      - openstack-infra/devstack-gate
+      - openstack/devstack
+      - openstack/devstack-gate
       - openstack/barbican
       - openstack/barbican-tempest-plugin
       - openstack/python-barbicanclient
@@ -42,11 +42,11 @@
       castellan_from_git: 0
       cursive: 0
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/barbican
       - openstack/barbican-tempest-plugin
       - openstack/castellan
-      - openstack/cursive
+      - x/cursive
       - openstack/python-barbicanclient
       - openstack/tempest
     run: playbooks/legacy/barbican-devstack-tempest-base/run.yaml
@@ -153,8 +153,8 @@
     run: playbooks/legacy/grenade-devstack-barbican/run.yaml
     post-run: playbooks/legacy/grenade-devstack-barbican/post.yaml
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
       - openstack/barbican
       - openstack/barbican-tempest-plugin
       - openstack/python-barbicanclient
diff --git a/playbooks/legacy/barbican-devstack-base/run.yaml b/playbooks/legacy/barbican-devstack-base/run.yaml
index ef05a90f3..ff668e0e7 100644
--- a/playbooks/legacy/barbican-devstack-base/run.yaml
+++ b/playbooks/legacy/barbican-devstack-base/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 }}'
@@ -32,7 +32,7 @@
           export PROJECTS="openstack/barbican $PROJECTS"
           export PROJECTS="openstack/python-barbicanclient $PROJECTS"
           export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican https://git.openstack.org/openstack/barbican"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican https://opendev.org/openstack/barbican"
           if [ "{{ python_version }}" == "py35" ] ; then
              export DEVSTACK_GATE_USE_PYTHON3=True
              export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
diff --git a/playbooks/legacy/barbican-devstack-functional-base/run.yaml b/playbooks/legacy/barbican-devstack-functional-base/run.yaml
index bb74a9242..eb07364ab 100644
--- a/playbooks/legacy/barbican-devstack-functional-base/run.yaml
+++ b/playbooks/legacy/barbican-devstack-functional-base/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,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin barbican https://git.openstack.org/openstack/barbican
+          enable_plugin barbican https://opendev.org/openstack/barbican
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/barbican-devstack-tempest-base/run.yaml b/playbooks/legacy/barbican-devstack-tempest-base/run.yaml
index df253b180..24b3caef5 100644
--- a/playbooks/legacy/barbican-devstack-tempest-base/run.yaml
+++ b/playbooks/legacy/barbican-devstack-tempest-base/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 }}'
@@ -35,7 +35,7 @@
           export PROJECTS="openstack/barbican $PROJECTS"
           export PROJECTS="openstack/python-barbicanclient $PROJECTS"
           export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican https://git.openstack.org/openstack/barbican"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican https://opendev.org/openstack/barbican"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/barbican-tempest-plugin'"
 
           export BRANCH_OVERRIDE=default
diff --git a/playbooks/legacy/grenade-devstack-barbican/run.yaml b/playbooks/legacy/grenade-devstack-barbican/run.yaml
index 5f6018029..8e889732b 100644
--- a/playbooks/legacy/grenade-devstack-barbican/run.yaml
+++ b/playbooks/legacy/grenade-devstack-barbican/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 }}'
@@ -30,11 +30,11 @@
           export PYTHONUNBUFFERED=true
 
           export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
           export PROJECTS="openstack/python-barbicanclient $PROJECTS"
           export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
 
-          export GRENADE_PLUGINRC="enable_grenade_plugin barbican https://git.openstack.org/openstack/barbican"
+          export GRENADE_PLUGINRC="enable_grenade_plugin barbican https://opendev.org/openstack/barbican"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/barbican-tempest-plugin'"
 
           export DEVSTACK_GATE_TEMPEST=1