diff --git a/scripts/openstack-quickstart-demosetup b/scripts/openstack-quickstart-demosetup
index 57cef47..2b7eb8a 100755
--- a/scripts/openstack-quickstart-demosetup
+++ b/scripts/openstack-quickstart-demosetup
@@ -685,29 +685,32 @@ fi
 #---------------------------------------
 
 # Start glance and nova
-for s in openstack-glance-api openstack-glance-registry \
-    openstack-nova-api openstack-nova-conductor openstack-nova-scheduler \
-    openstack-nova-novncproxy
+for s in openstack-glance-api openstack-glance-registry
 do
     start_and_enable_service $s
 done
 
-if [ "x$node_is_compute" = "xyes" ]; then
-    start_and_enable_service openstack-nova-compute
-fi
+# Setup api_db
+nova-manage api_db sync
 
 # migrate data directly
 nova-manage db online_data_migrations
 
+# Start nova (Conductor first, API last!)
+for s in openstack-nova-conductor openstack-nova-scheduler \
+    openstack-nova-novncproxy openstack-nova-api
+do
+    start_and_enable_service $s
+done
+
+if [ "x$node_is_compute" = "xyes" ]; then
+    start_and_enable_service openstack-nova-compute
+fi
+
 # do cell setup (mandatory since Ocata)
 nova-manage cell_v2 simple_cell_setup --transport-url rabbit://openstack:$pw@$IP
 nova-manage cell_v2 discover_hosts --verbose
 
-### Figure out why this  restart is needed ??!
-# 2018-08-30: without the compute node is not registered properly
-for s in openstack-nova-conductor openstack-nova-scheduler; do
-    systemctl restart $s
-done
 
 if [ "x$with_tempest" = "xyes" ]; then
     start_and_enable_service openstack-ec2-api-s3