diff --git a/setup-viirb.sh b/setup-viirb.sh
index d5337de..63286cb 100755
--- a/setup-viirb.sh
+++ b/setup-viirb.sh
@@ -368,6 +368,9 @@ stage5()
     cat <<EOF | ssh -t "root@${viirb_ip}"
 # Remove temporary IP
 uci delete network.lanv4temp
+
+# Correct SSID
+uci set wireless.default_radio0.ssid='IPv6 everywhere'
 uci commit
 
 # Remove our ssh keys
diff --git a/viirb-cleanup-final-stage.sh b/viirb-cleanup-final-stage.sh
new file mode 100644
index 0000000..ee7c0f6
--- /dev/null
+++ b/viirb-cleanup-final-stage.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Nico Schottelius
+# 2020-06-14
+
+set -e
+set -x
+
+viirb_ip=$1; shift
+root_password=$(pwgen -1 32)
+
+
+cat <<EOF | ssh -t "root@${viirb_ip}"
+# Remove temporary IP
+uci delete network.lanv4temp
+
+# Correct test SSID to final one
+uci set wireless.default_radio0.ssid='IPv6 everywhere'
+uci commit
+
+# Remove our ssh keys
+rm -f /etc/dropbear/authorized_keys
+
+# Setup root password
+printf "${root_password}\n${root_password}\n" | passwd
+EOF
+
+    echo "Submit to user the root password = ${root_password}"
+
+}