diff --git a/devstack/lib/nsx_common b/devstack/lib/nsx_common
index d7fdcc7752..effeaccc3f 100644
--- a/devstack/lib/nsx_common
+++ b/devstack/lib/nsx_common
@@ -31,7 +31,7 @@ function _nsxv_ini_set {
 
 
 function install_neutron_projects {
-    pkg_list="networking-l2gw networking-sfc neutron-fwaas neutron-dynamic-routing neutron-vpnaas octavia octavia-lib vmware-nsxlib"
+    pkg_list="networking-l2gw networking-sfc neutron-fwaas neutron-dynamic-routing neutron-vpnaas vmware-nsxlib"
     for pkg in `echo $pkg_list`
     do
         pkg_renamed=`echo $pkg | sed 's/-/_/g'`
@@ -47,6 +47,7 @@ function install_neutron_projects {
             sudo chown -R ${USER}:${USER} src/${pkg}
         fi
     done
+    # install neutron and octavia separately to not delete neutron-lib & octavia-lib
     sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron
     sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron.egg*
     sudo rm -rf /usr/local/lib/python3.5/dist-packages/neutron
@@ -57,6 +58,17 @@ function install_neutron_projects {
         sudo -H pip install -e "git+https://opendev.org/openstack/neutron@${NEUTRON_BRANCH}#egg=neutron"
         sudo chown -R ${USER}:${USER} src/neutron
     fi
+
+    sudo rm -rf /usr/local/lib/python2.7/dist-packages/octavia
+    sudo rm -rf /usr/local/lib/python2.7/dist-packages/octavia.egg*
+    sudo rm -rf /usr/local/lib/python3.5/dist-packages/octavia
+    sudo rm -rf /usr/local/lib/python3.5/dist-packages/octavia.egg*
+    if is_service_enabled octavia; then
+       echo "service octavia is enabled explicitly by devstack"
+    else
+        sudo -H pip install -e "git+https://opendev.org/openstack/octavia@${NEUTRON_BRANCH}#egg=octavia"
+        sudo chown -R ${USER}:${USER} src/octavia
+    fi
 }
 
 function nsxv_configure_service {
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 52756952e9..6318e896e6 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -10,7 +10,7 @@ httplib2==0.9.1
 mock==2.0.0
 netaddr==0.7.18
 neutron-lib==1.28.0
-octavia-lib==1.1.1
+octavia-lib==1.3.1
 openstackdocstheme==1.18.1
 oslo.concurrency==3.26.0
 oslo.config==5.2.0
@@ -38,7 +38,7 @@ SQLAlchemy==1.2.0
 sphinx==1.6.5
 stestr==1.0.0
 stevedore==1.20.0
-tenacity==5.0.1
+tenacity==5.0.2
 testtools==2.2.0
 tooz==1.58.0
 vmware-nsxlib==13.1.0
diff --git a/requirements.txt b/requirements.txt
index 7ca9fbca47..a422e85fce 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,13 +7,13 @@ eventlet>=0.24.1 # MIT
 httplib2>=0.9.1 # MIT
 requests>=2.14.2 # Apache-2.0
 netaddr>=0.7.18 # BSD
-tenacity>=5.0.1 # Apache-2.0
+tenacity>=5.0.2 # Apache-2.0
 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.2.0 # MIT
 six>=1.11.0 # MIT
 stevedore>=1.20.0 # Apache-2.0
 neutron-lib>=1.28.0 # Apache-2.0
 osc-lib>=1.10.0 # Apache-2.0
-octavia-lib>=1.1.1 # Apache-2.0
+octavia-lib>=1.3.1 # Apache-2.0
 python-openstackclient>=3.16.0 # Apache-2.0
 oslo.concurrency>=3.26.0 # Apache-2.0
 oslo.context>=2.19.2 # Apache-2.0