diff --git a/stage3/00-install-yunohost/00-run.sh b/stage3/00-install-yunohost/00-run.sh
index a731014..1140c98 100755
--- a/stage3/00-install-yunohost/00-run.sh
+++ b/stage3/00-install-yunohost/00-run.sh
@@ -1,11 +1,19 @@
 #!/bin/bash -e
 
+# Avahi and mysql/mariadb needs to do some stuff which conflicts with
+# the "change the root password asap" so we disable it. In fact, now
+# that YunoHost 3.3 syncs the password with admin password at
+# postinstall we are happy with not triggering a password change at
+# first boot.  Assuming that ARM-boards won't be exposed to global
+# network right after booting the first time ...
+on_chroot << EOF
+chage -d 99999999 root
+EOF
+
+# Run the actual install
 on_chroot << EOF
 apt-get install insserv -y
-cd /tmp/
-wget -O install_yunohost https://install.yunohost.org/stretch
-chmod +x /tmp/install_yunohost
-./install_yunohost -a
+curl https://install.yunohost.org/stretch | bash -s -- -a
 rm -f /etc/ssh/ssh_host_*
 EOF
 
@@ -14,7 +22,6 @@ on_chroot << EOF
 touch /boot/ssh
 sed -i '/PermitRootLogin/c\PermitRootLogin yes' /etc/ssh/sshd_config
 echo "root:yunohost" | chpasswd
-chage -d 0 root
 EOF
 
 install -m 755 files/check_yunohost_is_installed.sh "${ROOTFS_DIR}/etc/profile.d/"
@@ -23,14 +30,28 @@ echo "Cleaning ..."
 on_chroot << EOF
 apt-get clean
 find /var/log -type f -exec rm {} \;
-ps -ef --forest | grep qemu
 EOF
 
 # Gotta manually kill those stuff which are some sort of daemon running
 # for slapd / nscd / nslcd ... otherwise the script is unable to unmount
 # the rootfs/image after that ?
-for PID in `ps -ef --forest | grep "qemu-arm-static" | grep "nginx\|nscd\|slapd\|nslcd" | awk '{print $2}'`
+while lsof 2>/dev/null | grep -q /root/rpi-image/work/*/export-image/rootfs/dev;
 do
+    for PID in `ps -ef --forest | grep "qemu-arm-static" | grep -v "grep" | grep "nginx\|nscd\|slapd\|nslcd" | awk '{print $2}'`
+    do
         echo "Killing $PID"
-        kill -9 $PID
+        kill -9 $PID || true
+        sleep 1
+    done
+    sleep 5
+done
+while ps -ef --forest | grep "qemu-arm-static" | grep -v "grep"
+do
+    for PID in `ps -ef --forest | grep "qemu-arm-static" | grep -v "grep" | grep "nginx\|nscd\|slapd\|nslcd" | awk '{print $2}'`
+    do
+        echo "Killing $PID"
+        kill -9 $PID || true
+        sleep 1
+    done
+    sleep 5
 done