diff --git a/viirb-2-configure-fully-after-upgrade.sh b/viirb-2-configure-fully-after-upgrade.sh
index b190e94..c7dc10a 100755
--- a/viirb-2-configure-fully-after-upgrade.sh
+++ b/viirb-2-configure-fully-after-upgrade.sh
@@ -125,7 +125,8 @@ EOF
 # 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
+# Found: 30s is not enough for full reconfiguration
+sleep 60
 
 # change to ipv6
 viirb_ip=${my_lan_ip}
diff --git a/viirb-3-configure-vpnendpoint.sh b/viirb-3-configure-vpnendpoint.sh
index d03b90e..cd21131 100755
--- a/viirb-3-configure-vpnendpoint.sh
+++ b/viirb-3-configure-vpnendpoint.sh
@@ -55,8 +55,9 @@ git push
 cdist config -vv -j8 ${vpn_endpoint_host} -c ${dot_cdist}
 
 # Test that the VPN connection is established
+# Might take longer due to reboot
 sleep 10
 
-ping -c3 ${my_wireguard_ip}
-ping -c3 ${my_lan_ip}
-ping -c3 ${my_wifi_ip}
+ping -c10 ${my_wireguard_ip}
+ping -c10 ${my_lan_ip}
+ping -c10 ${my_wifi_ip}