diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index d41d415f..4c96b51f 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -65,6 +65,18 @@ function setup_localrc() {
         if [ "$DEVSTACK_GATE_CELLS" -eq "1" ]; then
             MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-cell
         fi
+    elif [ "$LOCALRC_BRANCH" == "stable/havana" ]; then
+        MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,c-bak,n-cond,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api
+        if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
+            MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-vpn
+            echo "Q_USE_DEBUG_COMMAND=True" >>localrc
+            echo "NETWORK_GATEWAY=10.1.0.1" >>localrc
+        else
+            MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net
+        fi
+        if [ "$DEVSTACK_GATE_CELLS" -eq "1" ]; then
+            MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-cell
+        fi
     else # master
         MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,c-bak,n-cond,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api
         if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then