diff --git a/devstack/Vagrantfile b/devstack/Vagrantfile
index 999086d..a89993f 100644
--- a/devstack/Vagrantfile
+++ b/devstack/Vagrantfile
@@ -54,7 +54,7 @@ Vagrant.configure(2) do |config|
       sudo cp ./maven_proxy_settings.xml /root/.m2/settings.xml
     fi
 
-    git clone https://git.openstack.org/openstack-dev/devstack --branch master --depth 1
+    git clone https://opendev.org/openstack/devstack --branch master --depth 1
     cd devstack
     echo '[[local|localrc]]
 
@@ -83,10 +83,10 @@ enable_service rabbit mysql key tempest horizon
 disable_service monasca-api monasca-thresh monasca-agent monasca-notification
 disable_service  monasca-log-persister monasca-log-agent monasca-log-metrics monasca-log-transformer monasca-log-api
 
-enable_plugin monasca-api https://git.openstack.org/openstack/monasca-api
-enable_plugin monasca-log-api https://git.openstack.org/openstack/monasca-log-api
-enable_plugin monasca-events-api https://git.openstack.org/openstack/monasca-events-api
-enable_plugin monasca-tempest-plugin https://git.openstack.org/openstack/monasca-tempest-plugin
+enable_plugin monasca-api https://opendev.org/openstack/monasca-api
+enable_plugin monasca-log-api https://opendev.org/openstack/monasca-log-api
+enable_plugin monasca-events-api https://opendev.org/openstack/monasca-events-api
+enable_plugin monasca-tempest-plugin https://opendev.org/openstack/monasca-tempest-plugin
 
 ' > local.conf
     ./stack.sh
diff --git a/tox.ini b/tox.ini
index 6828855..f28a169 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ whitelist_externals = bash
                       rm
 install_command = pip install {opts} {packages}
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
  -r{toxinidir}/test-requirements.txt
  -r{toxinidir}/requirements.txt
 commands =