diff --git a/playbooks/proposal/generate_puppetfile.sh b/playbooks/proposal/generate_puppetfile.sh
index 75f3a69b45..ac21542a73 100755
--- a/playbooks/proposal/generate_puppetfile.sh
+++ b/playbooks/proposal/generate_puppetfile.sh
@@ -17,7 +17,7 @@ for p in $(cat openstack_modules.txt); do
     # TODO(emilien) we need to add support for stable branches
     cat >> $DIR/Puppetfile <<EOF
 mod '$title',
-  :git => 'https://git.openstack.org/openstack/puppet-$p',
+  :git => 'https://opendev.org/openstack/puppet-$p',
   :ref => 'master'
 
 EOF
diff --git a/playbooks/proposal/propose_update.sh b/playbooks/proposal/propose_update.sh
index c9110a23e1..7877beca7c 100755
--- a/playbooks/proposal/propose_update.sh
+++ b/playbooks/proposal/propose_update.sh
@@ -105,7 +105,7 @@ for PROJECT in $PROJECTS; do
     #
     # TODO(fungi): switch to zuul-cloner once we add a persistent git cache
     # to proposal.slave.openstack.org
-    if ! git clone https://git.openstack.org/$PROJECT.git; then
+    if ! git clone https://opendev.org/$PROJECT; then
         # ALL_SUCCESS is being set to 1, which means that a failure condition
         # has been detected. The job will end in failure once it finishes
         # cycling through the remaining projects.
diff --git a/roles/build-wheels/files/wheel-build.sh b/roles/build-wheels/files/wheel-build.sh
index 498f379ce9..7c3eb2ca8b 100755
--- a/roles/build-wheels/files/wheel-build.sh
+++ b/roles/build-wheels/files/wheel-build.sh
@@ -2,7 +2,7 @@
 
 # Working variables
 WHEELHOUSE_DIR=$1
-WORKING_DIR=$(pwd)/src/git.openstack.org/openstack/requirements
+WORKING_DIR=$(pwd)/src/opendev.org/openstack/requirements
 PYTHON_VERSION=$2
 LOGS=$(pwd)/logs
 
diff --git a/roles/copy-release-tools-scripts/files/release-tools/clone_repo.sh b/roles/copy-release-tools-scripts/files/release-tools/clone_repo.sh
index bc22191c3f..5c11316c25 100755
--- a/roles/copy-release-tools-scripts/files/release-tools/clone_repo.sh
+++ b/roles/copy-release-tools-scripts/files/release-tools/clone_repo.sh
@@ -56,7 +56,7 @@ Options:
   --ref -- The git reference to check out. Defaults to HEAD.
 
   --upstream -- The upstream server URL, without the git repo
-                part. Defaults to https://git.openstack.org
+                part. Defaults to https://opendev.org
 
 EOF
 }
@@ -66,7 +66,7 @@ WORKSPACE="."
 CACHE_DIR="${ZUUL_CACHE_DIR:-/opt/git}"
 BRANCH="master"
 REF=""
-UPSTREAM="https://git.openstack.org"
+UPSTREAM="https://opendev.org"
 RETRY_LIMIT=3
 export GIT_HTTP_LOW_SPEED_TIME=300
 export GIT_HTTP_LOW_SPEED_LIMIT=1000
diff --git a/roles/copy-release-tools-scripts/files/release-tools/eol_branch.sh b/roles/copy-release-tools-scripts/files/release-tools/eol_branch.sh
index a2559c19a8..30abea15b2 100755
--- a/roles/copy-release-tools-scripts/files/release-tools/eol_branch.sh
+++ b/roles/copy-release-tools-scripts/files/release-tools/eol_branch.sh
@@ -79,13 +79,13 @@ function abandon_reviews {
     fi
 
     gerrit_query="--current-patch-set status:open project:$project branch:$BRANCH"
-    revisions=($(ssh -p 29418 review.openstack.org gerrit query $gerrit_query |
+    revisions=($(ssh -p 29418 review.opendev.org gerrit query $gerrit_query |
         grep '^    revision: [a-f0-9]\{40\}$' | cut -b 15-))
     for rev in "${revisions[@]}"; do
         if [ $VERBOSE = true ]; then
             echo "Found commit $rev to abandon"
         fi
-        $DEBUG ssh -p 29418 review.openstack.org gerrit review --project $project --abandon --message \"$EOL_MESSAGE\" $rev
+        $DEBUG ssh -p 29418 review.opendev.org gerrit review --project $project --abandon --message \"$EOL_MESSAGE\" $rev
     done
 }
 
@@ -112,7 +112,7 @@ while (( "$#" )); do
     if ! [ -d $project/.git ]; then
         if ! [ -d $project ]; then
             echo "$project not found on filesystem. Will attempt to clone"
-            $DEBUG git clone https://git.openstack.org/$project $project
+            $DEBUG git clone https://opendev.org/$project $project
         else
             warning_message "$project is not a git repo"
             echo "skipping..."
@@ -128,7 +128,7 @@ while (( "$#" )); do
             # happens when a probject is no longer maintained.
             user=`git config --global gitreview.username`
             warning_message "Guessing remote manually"
-            git remote add $REMOTE ssh://$user@review.openstack.org:29418/$project.git
+            git remote add $REMOTE ssh://$user@review.opendev.org:29418/$project.git
         else
             git review -s
         fi
diff --git a/tools/propose_projects_yaml_update.sh b/tools/propose_projects_yaml_update.sh
index a369e77b9e..4ed889c348 100755
--- a/tools/propose_projects_yaml_update.sh
+++ b/tools/propose_projects_yaml_update.sh
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-PROJECT="openstack-infra/project-config"
+PROJECT="openstack/project-config"
 INITIAL_COMMIT_MSG="Normalize projects.yaml"
 TOPIC="project-yaml-normalization"
 USERNAME="proposal-bot"
@@ -30,7 +30,7 @@ change_id=""
 # See if there is an open change in the openstack/requirements topic
 # If so, get the change id for the existing change for use in the
 # commit msg.
-change_info=$(ssh -p 29418 $USERNAME@review.openstack.org gerrit query --current-patch-set status:open project:$PROJECT topic:$TOPIC owner:$USERNAME)
+change_info=$(ssh -p 29418 $USERNAME@review.opendev.org gerrit query --current-patch-set status:open project:$PROJECT topic:$TOPIC owner:$USERNAME)
 previous=$(echo "$change_info" | grep "^  number:" | awk '{print $2}')
 if [ -n "$previous" ]; then
     change_id=$(echo "$change_info" | grep "^change" | awk '{print $2}')