diff --git a/.gitreview b/.gitreview
index 34e3d71891..7b510a5047 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=openstack/stx-config.git
+project=starlingx/config.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 689a326cbe..2323b04d4a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -50,9 +50,9 @@
     description: |
       Run py27 test for sysinv
     required-projects:
-      - openstack/stx-update
-      - openstack/stx-fault
-      - openstack/stx-integ
+      - starlingx/update
+      - starlingx/fault
+      - starlingx/integ
     files:
       - sysinv/sysinv/*
     vars:
@@ -76,9 +76,9 @@
     description: |
       Run pylint test for sysinv
     required-projects:
-      - openstack/stx-update
-      - openstack/stx-fault
-      - openstack/stx-integ
+      - starlingx/update
+      - starlingx/fault
+      - starlingx/integ
     files:
       - sysinv/sysinv/*
     vars:
@@ -100,8 +100,8 @@
     parent: tox
     description: Run py27 tests for controllerconfig
     required-projects:
-      - openstack/stx-update
-      - openstack/stx-fault
+      - starlingx/update
+      - starlingx/fault
     files:
       - controllerconfig/*
     vars:
@@ -113,8 +113,8 @@
     parent: tox
     description: Run pylint tests for controllerconfig
     required-projects:
-      - openstack/stx-update
-      - openstack/stx-fault
+      - starlingx/update
+      - starlingx/fault
     files:
       - controllerconfig/*
     vars:
@@ -136,9 +136,9 @@
     parent: stx-devstack-base
     timeout: 7800
     required-projects:
-      - openstack/stx-update
-      - openstack/stx-fault
-      - openstack/stx-integ
+      - starlingx/update
+      - starlingx/fault
+      - starlingx/integ
     vars:
       tox_envlist: functional
       devstack_services:
@@ -170,9 +170,9 @@
     files:
       - sysinv/cgts-client/*
     required-projects:
-      - openstack/stx-update
-      - openstack/stx-fault
-      - openstack/stx-integ
+      - starlingx/update
+      - starlingx/fault
+      - starlingx/integ
     vars:
       tox_envlist: py27
       tox_extra_args: -c sysinv/cgts-client/cgts-client/tox.ini
@@ -196,9 +196,9 @@
     files:
       - sysinv/cgts-client/*
     required-projects:
-      - openstack/stx-update
-      - openstack/stx-fault
-      - openstack/stx-integ
+      - starlingx/update
+      - starlingx/fault
+      - starlingx/integ
     vars:
       tox_envlist: pylint
       tox_extra_args: -c sysinv/cgts-client/cgts-client/tox.ini
diff --git a/playbooks/tox-puppet-lint/pre.yaml b/playbooks/tox-puppet-lint/pre.yaml
index 7328afba9f..94df727931 100644
--- a/playbooks/tox-puppet-lint/pre.yaml
+++ b/playbooks/tox-puppet-lint/pre.yaml
@@ -1,5 +1,5 @@
 # Job cloned from:
-# https://github.com/openstack-infra/openstack-zuul-jobs/blob/master/playbooks/legacy/puppet-lint/run.yaml
+# https://github.com/openstack/openstack-zuul-jobs/blob/master/playbooks/legacy/puppet-lint/run.yaml
 # to install gem and puppet-lint in Zuul operating enviroment,
 # before running puppet-lint within the tox.ini file. The only
 # modification to this job is to not run puppet-lint here.
@@ -42,7 +42,7 @@
               dest: .
           EOF
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT
+              git://opendev.org $ZUUL_PROJECT
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'