diff --git a/jenkins/userid-validation b/jenkins/userid-validation
index 443076b..c9af893 100755
--- a/jenkins/userid-validation
+++ b/jenkins/userid-validation
@@ -12,10 +12,10 @@
 # Required Inputs:
 #  SSH_KEY:  Path to private ssh key used to post messages to gerrit
 
-GERRIT_COMMAND="curl -s --anyauth -n https://gerrit.openbmc-project.xyz"
+GERRIT_COMMAND="curl -s --anyauth -n https://gerrit.openbmc.org"
 GERRIT_SSH_CMD=( \
     ssh -o 'StrictHostKeyChecking no' -i "$SSH_KEY" \
-    -p 29418 jenkins-openbmc-ci@gerrit.openbmc-project.xyz gerrit \
+    -p 29418 jenkins-openbmc-ci@gerrit.openbmc.org gerrit \
 )
 
 echo "Checking ${GERRIT_PROJECT}:${GERRIT_BRANCH}:${GERRIT_CHANGE_ID}:${GERRIT_PATCHSET_REVISION}"
diff --git a/run-rootfs-size-docker.sh b/run-rootfs-size-docker.sh
index f47bcae..6b34d07 100755
--- a/run-rootfs-size-docker.sh
+++ b/run-rootfs-size-docker.sh
@@ -44,12 +44,12 @@
 
 if [ ! -d "${WORKSPACE}/${OBMC_BUILD_SCRIPTS}" ]; then
     echo "Clone (${OBMC_BUILD_SCRIPTS}) in ${WORKSPACE}..."
-    git clone https://gerrit.openbmc-project.xyz/openbmc/${OBMC_BUILD_SCRIPTS} "${WORKSPACE}"/${OBMC_BUILD_SCRIPTS}
+    git clone https://gerrit.openbmc.org/openbmc/${OBMC_BUILD_SCRIPTS} "${WORKSPACE}"/${OBMC_BUILD_SCRIPTS}
 fi
 
 if [ ! -d "${WORKSPACE}/${OBMC_TOOLS}" ]; then
     echo "Clone (${OBMC_TOOLS}) in ${WORKSPACE}..."
-    git clone https://gerrit.openbmc-project.xyz/openbmc/${OBMC_TOOLS} "${WORKSPACE}"/${OBMC_TOOLS}
+    git clone https://gerrit.openbmc.org/openbmc/${OBMC_TOOLS} "${WORKSPACE}"/${OBMC_TOOLS}
 fi
 
 # Copy rootfs_size.py script into workspace
diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index c44d72b..81ae0fc 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -246,7 +246,7 @@
     pkg_dir = os.path.join(WORKSPACE, pkg)
     if os.path.exists(os.path.join(pkg_dir, '.git')):
         return pkg_dir
-    pkg_repo = urljoin('https://gerrit.openbmc-project.xyz/openbmc/', pkg)
+    pkg_repo = urljoin('https://gerrit.openbmc.org/openbmc/', pkg)
     os.mkdir(pkg_dir)
     printline(pkg_dir, "> git clone", pkg_repo, branch, "./")
     try:
diff --git a/test-distro.sh b/test-distro.sh
index a7a44bd..9bd1e95 100755
--- a/test-distro.sh
+++ b/test-distro.sh
@@ -90,7 +90,7 @@
     git clone "${prj_package}" "${workspace}"/"${package}"
     return
   fi
-  git clone https://gerrit.openbmc-project.xyz/openbmc/"${package}" "${workspace}"/"${package}"
+  git clone https://gerrit.openbmc.org/openbmc/"${package}" "${workspace}"/"${package}"
 }
 
 jenkins_get_job_repos "${CONFIG}" | while read -r GERRIT_PROJECT