diff --git a/.zuul.yaml b/.zuul.yaml
index 40fdaabe4c..886c7623da 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,7 +10,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/neutron
-              - openstack/networking-l2gw
+              - x/networking-l2gw
               - openstack/networking-sfc
               - x/vmware-nsxlib
               - openstack/neutron-fwaas
@@ -22,7 +22,7 @@
             timeout: 5400
             required-projects:
               - openstack/neutron
-              - openstack/networking-l2gw
+              - x/networking-l2gw
               - openstack/networking-sfc
               - x/vmware-nsxlib
               - openstack/neutron-fwaas
@@ -34,7 +34,7 @@
             timeout: 5400
             required-projects:
               - openstack/neutron
-              - openstack/networking-l2gw
+              - x/networking-l2gw
               - openstack/networking-sfc
               - x/vmware-nsxlib
               - openstack/neutron-fwaas
@@ -46,7 +46,7 @@
             timeout: 5400
             required-projects:
               - openstack/neutron
-              - openstack/networking-l2gw
+              - x/networking-l2gw
               - openstack/networking-sfc
               - x/vmware-nsxlib
               - openstack/neutron-fwaas
@@ -61,7 +61,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/neutron
-              - openstack/networking-l2gw
+              - x/networking-l2gw
               - openstack/networking-sfc
               - x/vmware-nsxlib
               - openstack/neutron-fwaas
@@ -73,7 +73,7 @@
             timeout: 5400
             required-projects:
               - openstack/neutron
-              - openstack/networking-l2gw
+              - x/networking-l2gw
               - openstack/networking-sfc
               - x/vmware-nsxlib
               - openstack/neutron-fwaas
@@ -85,7 +85,7 @@
             timeout: 5400
             required-projects:
               - openstack/neutron
-              - openstack/networking-l2gw
+              - x/networking-l2gw
               - openstack/networking-sfc
               - x/vmware-nsxlib
               - openstack/neutron-fwaas
@@ -97,7 +97,7 @@
             timeout: 5400
             required-projects:
               - openstack/neutron
-              - openstack/networking-l2gw
+              - x/networking-l2gw
               - openstack/networking-sfc
               - x/vmware-nsxlib
               - openstack/neutron-fwaas
@@ -112,7 +112,7 @@
     timeout: 5400
     required-projects:
       - openstack/neutron
-      - openstack/networking-l2gw
+      - x/networking-l2gw
       - openstack/networking-sfc
       - x/vmware-nsxlib
       - openstack/neutron-fwaas
diff --git a/devstack/lib/nsx_common b/devstack/lib/nsx_common
index effeaccc3f..069af4c69d 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 vmware-nsxlib"
+    pkg_list="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,23 @@ function install_neutron_projects {
             sudo chown -R ${USER}:${USER} src/${pkg}
         fi
     done
+    # same for packages out of stadium
+    pkg_list="networking-l2gw"
+    for pkg in `echo $pkg_list`
+    do
+        pkg_renamed=`echo $pkg | sed 's/-/_/g'`
+        sudo rm -rf /usr/local/lib/python2.7/dist-packages/${pkg_renamed}*
+        sudo rm -rf /usr/local/lib/python3.5/dist-packages/${pkg_renamed}*
+        sudo rm -rf ./src/${pkg_renamed}*
+        if is_plugin_enabled $pkg; then
+            echo "Plugin $pkg enabled explicitly with enable_plugin"
+        elif use_library_from_git $pkg; then
+            echo "Project $pkg enabled explicitly from LIBS_FROM_GIT"
+        else
+            sudo -H pip install -e "git+https://opendev.org/x/${pkg}@${NEUTRON_BRANCH}#egg=${pkg_renamed}"
+            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*
diff --git a/tox.ini b/tox.ini
index 321e377302..35f2c3f5b7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,7 @@ commands = false
 # https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs
 # note that order is important to ensure dependencies don't override
 commands =
-    pip install -q -e "git+https://opendev.org/openstack/networking-l2gw@stable/train#egg=networking_l2gw"
+    pip install -q -e "git+https://opendev.org/x/networking-l2gw@stable/train#egg=networking_l2gw"
     pip install -q -e "git+https://opendev.org/openstack/networking-sfc@stable/train#egg=networking_sfc"
     pip install -q -e "git+https://opendev.org/openstack/neutron-lbaas@stable/stein#egg=neutron_lbaas"
     pip install -q -e "git+https://opendev.org/openstack/neutron-fwaas@stable/train#egg=neutron_fwaas"