diff --git a/onos-build-vm.py b/onos-build-vm.py
index 041a86f..3dc44b2 100755
--- a/onos-build-vm.py
+++ b/onos-build-vm.py
@@ -45,6 +45,7 @@
     vm.sendline('ssh 127.0.0.1')
     vm.expect('.*connecting (yes/no)?')
     vm.sendline('yes')
+    vm.expect(prompt, timeout=30)
     vm.sendline('exit')
     
     vm.expect( prompt, timeout=1200 )
@@ -53,7 +54,7 @@
     vm.sendline( ' wget -O onos-setup.sh "%s" | bash' % url ) # space prefix is used to avoid entry in history
     vm.expect( prompt, timeout=20 )
     vm.sendline( 'bash onos-setup.sh' )
-    vm.expect(prompt, timeout=20)
+    vm.expect(prompt, timeout=600)
   
 
 def vmdk2size( vmdk ):