diff --git a/stack.sh b/stack.sh
index 7b4b3b7..14bb161 100755
--- a/stack.sh
+++ b/stack.sh
@@ -725,6 +725,8 @@
 configure_glanceclient
 
 if is_service_enabled nova; then
+    # First clean up old instances
+    cleanup_nova
     configure_nova
 fi
 if is_service_enabled horizon; then