diff --git a/openwrt/viirb-4-cleanup-final-stage.sh b/openwrt/viirb-4-cleanup.sh
similarity index 100%
rename from openwrt/viirb-4-cleanup-final-stage.sh
rename to openwrt/viirb-4-cleanup.sh
diff --git a/openwrt/viwib-2-configure.sh b/openwrt/viwib-2-configure.sh
index 688727b..cc4ef33 100755
--- a/openwrt/viwib-2-configure.sh
+++ b/openwrt/viwib-2-configure.sh
@@ -42,6 +42,10 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
+root_password=$(pwgen -1 32)
+echo $root_password > ${viwib_hostname}.rootpw
+
+
 cat <<EOF | ssh -t "root@${viwib_ip}"
 set -x
 # Setup lan to also retrieve an ip address via dhcp
@@ -173,15 +177,26 @@ uci set firewall.@zone[1].network='wan wan6 wg0'
 
 uci commit
 
+
+# Remove our ssh keys
+rm -f /etc/dropbear/authorized_keys
+
+# Setup root password
+printf "${root_password}\n${root_password}\n" | passwd
+
+
 reboot
 EOF
 
 echo "Wireguard public key and id: ${id} ${public_key}"
+echo "Root password: ${root_password}"
 echo ${public_key} > ${viwib_hostname}.public_key
 
 # change to ipv6
 viwib_ip=${my_lan_ip}
 
+sleep 15
+
 while ! ping -c5 ${viwib_ip}; do
     echo "Waiting for viwib ${id}"
     sleep 2