diff --git a/viirb-2-configure-fully-after-upgrade.sh b/viirb-2-configure-fully-after-upgrade.sh
index b96b967..b190e94 100755
--- a/viirb-2-configure-fully-after-upgrade.sh
+++ b/viirb-2-configure-fully-after-upgrade.sh
@@ -122,8 +122,10 @@ reboot
 #/etc/init.d/network restart
 EOF
 
-# ensure network is up and running - bridge takes a bit of time
-sleep 10
+# ensure viirb is back
+# ensure viirb network is up and running - bridge takes a bit of time
+# ensure viirb gives out ipv6 address
+sleep 30
 
 # change to ipv6
 viirb_ip=${my_lan_ip}
diff --git a/viirb-cleanup-final-stage.sh b/viirb-4-cleanup-final-stage.sh
similarity index 100%
rename from viirb-cleanup-final-stage.sh
rename to viirb-4-cleanup-final-stage.sh