diff --git a/HACKING.rst b/HACKING.rst
index 0cef0d3b..b57c7e3e 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -9,7 +9,7 @@ Grenade is written in POSIX shell script. It specifies BASH and is
 compatible with Bash 3.
 
 Grenade's official repository is located at
-https://git.openstack.org/cgit/openstack-dev/grenade.
+https://opendev.org/openstack/grenade.
 
 
 Scripts
diff --git a/PLUGINS.rst b/PLUGINS.rst
index 243dcd1f..82fbf777 100644
--- a/PLUGINS.rst
+++ b/PLUGINS.rst
@@ -226,7 +226,7 @@ Note: For using this with ``openstack-infra/devstack-gate`` you would set this
 by setting the GRENADE_PLUGINRC environment variable. For example to set it for
 Ironic::
 
-   export GRENADE_PLUGINRC="enable_grenade_plugin ironic https://git.openstack.org/openstack/ironic"
+   export GRENADE_PLUGINRC="enable_grenade_plugin ironic https://opendev.org/openstack/ironic"
 
 
 Changing Devstack Localrc
diff --git a/README.rst b/README.rst
index b4ab6faf..72d49c9f 100644
--- a/README.rst
+++ b/README.rst
@@ -157,7 +157,7 @@ Install Grenade
 
 Get Grenade from GitHub in the usual way::
 
-    git clone https://git.openstack.org/openstack-dev/grenade
+    git clone https://opendev.org/openstack/grenade
 
 Optional: running grenade against a remote target
 -------------------------------------------------
diff --git a/cache_git.sh b/cache_git.sh
index c372f342..91ae3344 100755
--- a/cache_git.sh
+++ b/cache_git.sh
@@ -28,7 +28,7 @@ PROJECTS+="openstack/tempest "
 PROJECTS+="openstack/neutron "
 PROJECTS+="openstack/ceilometer "
 PROJECTS+="openstack/horizon "
-PROJECTS+="openstack-dev/devstack "
+PROJECTS+="openstack/devstack "
 PROJECTS+="kanaka/noVNC "
 
 function usage {
diff --git a/grenaderc b/grenaderc
index 66c68c76..15bcbfd0 100644
--- a/grenaderc
+++ b/grenaderc
@@ -11,7 +11,7 @@ fi
 # Base GIT Repo URL
 # Another option is http://review.openstack.org/p
 # Another option is https://github.com
-GIT_BASE=${GIT_BASE:-https://git.openstack.org}
+GIT_BASE=${GIT_BASE:-https://opendev.org}
 #GIT_BASE=/opt/git
 
 # Destination path for installation ``STACK_ROOT``
@@ -26,7 +26,7 @@ TARGET_RELEASE=${TARGET_RELEASE:-new}
 TARGET_RELEASE_DIR=${STACK_ROOT}/$TARGET_RELEASE
 
 # DevStack sources
-BASE_DEVSTACK_REPO=$GIT_BASE/openstack-dev/devstack.git
+BASE_DEVSTACK_REPO=$GIT_BASE/openstack/devstack
 BASE_DEVSTACK_BRANCH=${BASE_DEVSTACK_BRANCH:-stable/train}
 BASE_DEVSTACK_DIR=${BASE_DEVSTACK_DIR:-$BASE_RELEASE_DIR/devstack}
 
diff --git a/setup-grenade b/setup-grenade
index 98dcd316..1c49c973 100755
--- a/setup-grenade
+++ b/setup-grenade
@@ -12,7 +12,7 @@
 SRC_DIR=$(cd $(dirname "$0") && pwd)
 
 # Set up some defaults if grenaderc is not present
-GRENADE_REPO=https://git.openstack.org/openstack-dev/grenade
+GRENADE_REPO=https://opendev.org/openstack/grenade
 GRENADE_DIR=${STACK_ROOT}/grenade
 GRENADE_BRANCH=master
 
diff --git a/tools/generate-grenade-plugins-list.sh b/tools/generate-grenade-plugins-list.sh
index bb665ede..4d7a0c35 100755
--- a/tools/generate-grenade-plugins-list.sh
+++ b/tools/generate-grenade-plugins-list.sh
@@ -28,9 +28,8 @@
 #   * the environment variable git_dir pointing to the location
 #   * of said git repositories
 #   ) OR (
-#   * network access to the review.openstack.org Gerrit API
-#     working directory
-#   * network access to https://git.openstack.org/cgit
+#   * network access to the review.opendev.org Gerrit API
+#   * network access to https://opendev.org/
 #   ))
 #
 # If a file named data/grenade-plugins-registry.header or
@@ -49,7 +48,7 @@ sorted_plugins=$(python tools/generate-grenade-plugins-list.py)
 
 for k in ${sorted_plugins}; do
     project=${k:0:40}
-    giturl="https://git.openstack.org/openstack/${k:0:36}"
+    giturl="https://opendev.org/openstack/${k:0:36}"
     printf "|%-40s|%-73s|\n" "${project}" "${giturl}"
     printf "+----------------------------------------+-------------------------------------------------------------------------+\n"
 done