diff --git a/nodepool/elements/nodepool-base/README.rst b/nodepool/elements/nodepool-base/README.rst
index 96ae0eeba7..aecaf4b85d 100644
--- a/nodepool/elements/nodepool-base/README.rst
+++ b/nodepool/elements/nodepool-base/README.rst
@@ -9,7 +9,7 @@ Environment variables:
 ``NODEPOOL_SCRIPTDIR`` path to copy Nodepool scripts from. It is set
 automatically by Nodepool.  For local hacking override it to where your scripts
 are. Default:
-``$TMP_MOUNT_PATH/opt/git/openstack/project-config/nodepool/scripts``.
+``$TMP_MOUNT_PATH/opt/git/opendev.org/openstack/project-config/nodepool/scripts``.
 
 Name resolution
 ---------------
diff --git a/nodepool/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts b/nodepool/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
index c4f5fb56ae..35be015a10 100755
--- a/nodepool/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
+++ b/nodepool/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
@@ -33,7 +33,7 @@ fi
 set -eu
 set -o pipefail
 
-NODEPOOL_SCRIPTDIR=${NODEPOOL_SCRIPTDIR:-$TMP_MOUNT_PATH/opt/git/openstack/project-config/nodepool/scripts}
+NODEPOOL_SCRIPTDIR=${NODEPOOL_SCRIPTDIR:-$TMP_MOUNT_PATH/opt/git/opendev.org/openstack/project-config/nodepool/scripts}
 
 sudo cp -a $NODEPOOL_SCRIPTDIR $TMP_MOUNT_PATH/opt/nodepool-scripts
 sudo chmod -R a+rx $TMP_MOUNT_PATH/opt/nodepool-scripts
diff --git a/nodepool/elements/nodepool-base/post-install.d/89-data-files b/nodepool/elements/nodepool-base/post-install.d/89-data-files
index 0172cd4563..2b6cbb4466 100755
--- a/nodepool/elements/nodepool-base/post-install.d/89-data-files
+++ b/nodepool/elements/nodepool-base/post-install.d/89-data-files
@@ -24,5 +24,5 @@ set -eu
 set -o pipefail
 
 mkdir -p /usr/local/bindep-fallback
-cp -a /opt/git/openstack/project-config/nodepool/elements/bindep-fallback.txt \
+cp -a /opt/git/opendev.org/openstack/project-config/nodepool/elements/bindep-fallback.txt \
     /usr/local/bindep-fallback/