diff --git a/tools/start b/tools/start
index e2f69c85f4..f5f8af8e34 100755
--- a/tools/start
+++ b/tools/start
@@ -28,6 +28,8 @@ fi
 MY_IP=$(ip route get $(ip route | awk '$1 == "default" {print $3}') |
     awk '$4 == "src" {print $5}')
 
+NETWORK_MANAGER=$(grep -ri NETWORK_MANAGER compose/openstack.env | cut -f2 -d'=')
+
 # Source openrc for commands
 source ./openrc
 
@@ -46,8 +48,15 @@ docker-compose -f ./compose/glance-api-registry.yml up -d
 echo Starting nova.
 docker-compose -f ./compose/nova-api-conductor-scheduler.yml up -d
 
-echo Starting nova compute with nova networking.
-docker-compose -f ./compose/nova-compute-network.yml up -d
+if [[ "${NETWORK_MANAGER}" == "nova" ]] ; then
+  echo Starting nova compute with nova networking.
+  docker-compose -f ./compose/nova-compute-network.yml up -d
+elif [[ "${NETWORK_MANAGER}" == "neutron" ]] ; then
+  echo Starting nova compute with neutron networking.
+  docker-compose -f ./compose/nova-compute.yml up -d
+  docker-compose -f ./compose/neutron-server.yml up -d
+  docker-compose -f ./compose/neutron-agents.yml up -d
+fi
 
 echo Starting heat.
 docker-compose -f ./compose/heat-api-engine.yml up -d
diff --git a/tools/stop b/tools/stop
index 1c0eb25c6b..3a3db3d516 100755
--- a/tools/stop
+++ b/tools/stop
@@ -10,6 +10,8 @@
 REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
 cd "$(dirname "$REAL_PATH")/.."
 
+NETWORK_MANAGER=$(grep -ri NETWORK_MANAGER compose/openstack.env | cut -f2 -d'=')
+
 echo Stopping rabbitmq.
 docker-compose -f ./compose/rabbitmq.yml stop
 
@@ -25,8 +27,15 @@ docker-compose -f ./compose/glance-api-registry.yml stop
 echo Stopping nova.
 docker-compose -f ./compose/nova-api-conductor-scheduler.yml stop
 
-echo Stopping nova compute with nova networking.
-docker-compose -f ./compose/nova-compute-network.yml stop
+if [[ "${NETWORK_MANAGER}" == "nova" ]] ; then
+  echo Stopping nova compute with nova networking.
+  docker-compose -f ./compose/nova-compute-network.yml stop
+elif [[ "${NETWORK_MANAGER}" == "neutron" ]] ; then
+  echo Stopping nova compute with neutron networking.
+  docker-compose -f ./compose/nova-compute.yml stop
+  docker-compose -f ./compose/neutron-server.yml up -d
+  docker-compose -f ./compose/neutron-agents.yml stop
+fi
 
 echo Stopping heat.
 docker-compose -f ./compose/heat-api-engine.yml stop