diff --git a/README.rst b/README.rst
index 6fff6fcb7..54bf02c26 100644
--- a/README.rst
+++ b/README.rst
@@ -31,12 +31,12 @@ IRC.
 Contributing
 ------------
 
-To browse the latest code, see: https://git.zuul-ci.org/cgit/nodepool/tree/
-To clone the latest code, use `git clone https://git.zuul-ci.org/nodepool`
+To browse the latest code, see: https://opendev.org/zuul/nodepool
+To clone the latest code, use `git clone https://opendev.org/zuul/nodepool`
 
-Bugs are handled at: https://storyboard.openstack.org/#!/project/openstack-infra/nodepool
+Bugs are handled at: https://storyboard.openstack.org/#!/project/zuul/nodepool
 
-Code reviews are handled by gerrit at https://review.openstack.org
+Code reviews are handled by gerrit at https://review.opendev.org
 
 After creating a Gerrit account, use `git review` to submit patches.
 Example::
diff --git a/devstack/settings b/devstack/settings
index 74473e70a..ead9de0ee 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -17,10 +17,10 @@ NODEPOOL_PAUSE_OPENSUSE_150_DIB=${NODEPOOL_PAUSE_OPENSUSE_150_DIB:-true}
 NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB=${NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB:-true}
 NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB=${NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB:-true}
 
-DISKIMAGE_BUILDER_REPO_URL=${DISKIMAGE_BUILDER_REPO_URL:-https://git.openstack.org/openstack/diskimage-builder}
+DISKIMAGE_BUILDER_REPO_URL=${DISKIMAGE_BUILDER_REPO_URL:-https://opendev.org/openstack/diskimage-builder}
 DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
 
-GLEAN_REPO_URL=${GLEAN_REPO_URL:-https://git.openstack.org/openstack/glean}
+GLEAN_REPO_URL=${GLEAN_REPO_URL:-https://opendev.org/opendev/glean}
 GLEAN_REPO_REF=${GLEAN_REPO_REF:-master}
 
 DOGPILE_CACHE_REPO_URL=${DOGPILE_CACHE_REPO_URL:-https://github.com/sqlalchemy/dogpile.git}
diff --git a/tox.ini b/tox.ini
index f0f842485..6bdb91193 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,7 +61,7 @@ commands = stestr --test-path ./nodepool/tests/functional/openshift run --no-sub
            stestr slowest
 
 [flake8]
-# These are ignored intentionally in openstack-infra projects;
+# These are ignored intentionally in zuul projects;
 # please don't submit patches that solely correct them or enable them.
 ignore = E124,E125,E129,E402,H,W503
 show-source = True