diff --git a/HACKING.rst b/HACKING.rst
index cd3c49c..3392185 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,4 +1,4 @@
 openstack Style Commandments
-===============================================
+============================
 
 Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/
diff --git a/README.rst b/README.rst
index 96936bc..31a93a8 100644
--- a/README.rst
+++ b/README.rst
@@ -9,5 +9,5 @@ It contains the tempest plugin for the functional testing of Monasca Project.
 * Free software: Apache license
 * Documentation: https://docs.openstack.org/monasca-api/latest/
 * Release notes: https://docs.openstack.org/releasenotes/monasca-api/
-* Source: https://git.openstack.org/cgit/openstack/monasca-tempest-plugin
-* Bugs: https://bugs.launchpad.net/monasca
+* Source: https://opendev.org/openstack/monasca-tempest-plugin
+* Bugs: https://storyboard.openstack.org/#!/project/919
diff --git a/devstack/README.rst b/devstack/README.rst
index 3f91377..e6848a3 100644
--- a/devstack/README.rst
+++ b/devstack/README.rst
@@ -8,14 +8,14 @@ repository.
 
 1. Download DevStack::
 
-    git clone https://git.openstack.org/openstack-dev/devstack.git
+    git clone https://opendev.org/openstack/devstack.git
     cd devstack
 
 2. Add this repo as an external repository::
 
      > cat local.conf
      [[local|localrc]]
-     enable_plugin monasca-tempest-plugin https://git.openstack.org/openstack/monasca-tempest-plugin
+     enable_plugin monasca-tempest-plugin https://opendev.org/openstack/monasca-tempest-plugin
 
 3. run ``stack.sh``
 
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 8823557..5520fe0 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -8,6 +8,6 @@ the same environment where Tempest is installed.
 
 At the command line::
 
-    $ git clone https://git.openstack.org/openstack/monasca-tempest-plugin
+    $ git clone https://opendev.org/openstack/monasca-tempest-plugin
     $ cd monasca-tempest-plugin/
     $ pip install monasca-tempest-plugin
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f85e823..6fd9cad 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 ARG DOCKER_IMAGE=monasca/tempest-tests
-ARG APP_REPO=https://git.openstack.org/openstack/monasca-tempest-plugin
+ARG APP_REPO=https://review.opendev.org/openstack/monasca-tempest-plugin
 
 # Branch, tag or git hash to build from.
 ARG REPO_VERSION=master
diff --git a/docker/build_image.sh b/docker/build_image.sh
index abf89c4..e49f137 100755
--- a/docker/build_image.sh
+++ b/docker/build_image.sh
@@ -59,12 +59,12 @@ cd "$(dirname "$REAL_PATH")/../docker/"
 REPO_VERSION_CLEAN=$(echo "$REPO_VERSION" | sed 's|/|-|g')
 
 [ -z "$APP_REPO" ] && APP_REPO=$(\grep APP_REPO Dockerfile | cut -f2 -d"=")
-GITHUB_REPO=$(echo "$APP_REPO" | sed 's/git.openstack.org/github.com/' | \
+GITHUB_REPO=$(echo "$APP_REPO" | sed 's/review.opendev.org/github.com/' | \
               sed 's/ssh:/https:/')
 
 if [ -z "$CONSTRAINTS_FILE" ]; then
     CONSTRAINTS_FILE=$(\grep CONSTRAINTS_FILE Dockerfile | cut -f2 -d"=") || true
-    : "${CONSTRAINTS_FILE:=http://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}"
+    : "${CONSTRAINTS_FILE:=https://releases.openstack.org/constraints/upper/master}"
 fi
 
 : "${CONSTRAINTS_BRANCH:=$2}"
@@ -75,10 +75,11 @@ fi
 case "$REPO_VERSION" in
     *stable*)
         CONSTRAINTS_BRANCH_CLEAN="$REPO_VERSION"
+        CONSTRAINTS_FILE=${CONSTRAINTS_FILE/master/$CONSTRAINTS_BRANCH_CLEAN}
         # Get monasca-common version from stable upper constraints file.
         CONSTRAINTS_TMP_FILE=$(mktemp)
         wget --output-document "$CONSTRAINTS_TMP_FILE" \
-            "$CONSTRAINTS_FILE"?h="$CONSTRAINTS_BRANCH_CLEAN"
+            $CONSTRAINTS_FILE
         UPPER_COMMON=$(\grep 'monasca-common' "$CONSTRAINTS_TMP_FILE")
         # Get only version part from monasca-common.
         UPPER_COMMON_VERSION="${UPPER_COMMON##*===}"
@@ -92,7 +93,7 @@ esac
 # Monasca-common variables.
 if [ -z "$COMMON_REPO" ]; then
     COMMON_REPO=$(\grep COMMON_REPO Dockerfile | cut -f2 -d"=") || true
-    : "${COMMON_REPO:=https://git.openstack.org/openstack/monasca-common}"
+    : "${COMMON_REPO:=https://review.opendev.org/openstack/monasca-common}"
 fi
 : "${COMMON_VERSION:=$3}"
 if [ -z "$COMMON_VERSION" ]; then
@@ -143,7 +144,6 @@ docker build --no-cache \
     --build-arg REPO_VERSION="$REPO_VERSION" \
     --build-arg GIT_COMMIT="$GIT_COMMIT" \
     --build-arg CONSTRAINTS_FILE="$CONSTRAINTS_FILE" \
-    --build-arg CONSTRAINTS_BRANCH="$CONSTRAINTS_BRANCH_CLEAN" \
     --build-arg COMMON_REPO="$COMMON_REPO" \
     --build-arg COMMON_VERSION="$COMMON_VERSION" \
     --build-arg COMMON_GIT_COMMIT="$COMMON_GIT_COMMIT" \
diff --git a/monasca_tempest_tests/README.md b/monasca_tempest_tests/README.md
index 528c33a..db530ee 100644
--- a/monasca_tempest_tests/README.md
+++ b/monasca_tempest_tests/README.md
@@ -6,7 +6,7 @@ Currently the devstack environment is needed to run the tests. Instructions on s
 1. Clone the OpenStack Tempest repo, and cd to it.
 
    ```
-   git clone https://git.openstack.org/openstack/tempest.git
+   git clone https://opendev.org/openstack/tempest.git
    cd tempest
    ```
 2. Create a virtualenv for running the Tempest tests and activate it. For example in the Tempest root dir
diff --git a/tox.ini b/tox.ini
index 22edcc5..5b2cbc5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning