diff --git a/sources/meta-yoe/recipes-siot/simpleiot/simpleiot_0.12.5.bb b/sources/meta-yoe/recipes-siot/simpleiot/simpleiot_0.12.6.bb
similarity index 97%
rename from sources/meta-yoe/recipes-siot/simpleiot/simpleiot_0.12.5.bb
rename to sources/meta-yoe/recipes-siot/simpleiot/simpleiot_0.12.6.bb
index b89242a4f..96d1036e5 100644
--- a/sources/meta-yoe/recipes-siot/simpleiot/simpleiot_0.12.5.bb
+++ b/sources/meta-yoe/recipes-siot/simpleiot/simpleiot_0.12.6.bb
@@ -11,7 +11,7 @@ DEPENDS += "go-native elm-binary-native nodejs-native curl-native ca-certificate
 
 inherit systemd update-rc.d goarch
 
-SRCREV = "503b9abd1df451f7def490173667bd82e61a7850"
+SRCREV = "79a514fc2749257c30a9aef26bdb64e636c7e0f4"
 
 BRANCH ?= "master"
 
diff --git a/sources/meta-yoe/recipes-support/updater/files/beaglebone/platform b/sources/meta-yoe/recipes-support/updater/files/beaglebone/platform
index 2fa865801..4241dcb04 100644
--- a/sources/meta-yoe/recipes-support/updater/files/beaglebone/platform
+++ b/sources/meta-yoe/recipes-support/updater/files/beaglebone/platform
@@ -69,6 +69,8 @@ OVERLAY_TYPE=persistent
 # which is used by volatile-binds during main rootfs boot
 PERSISTENT_BINDS=""
 
+MOUNT_BOOT=1
+
 plat_init() {
   msg "Running $PLAT initializations ..."
   cat /proc/cpuinfo | grep Revision | cut -d' ' -f 2 > /etc/hwrevision
diff --git a/sources/meta-yoe/recipes-support/updater/files/imx8mn-var-som/platform b/sources/meta-yoe/recipes-support/updater/files/imx8mn-var-som/platform
index 2d895ec1f..ead0ce320 100644
--- a/sources/meta-yoe/recipes-support/updater/files/imx8mn-var-som/platform
+++ b/sources/meta-yoe/recipes-support/updater/files/imx8mn-var-som/platform
@@ -67,7 +67,9 @@ IMX_BOOT_SEEK=32
 
 # Space separated list of dirs to create in /data
 # which is used by volatile-binds during main rootfs boot
-PERSISTENT_BINDS="/etc/ssh"
+PERSISTENT_BINDS=""
+
+MOUNT_BOOT=1
 
 plat_init() {
   msg "Running $PLAT initializations ..."
diff --git a/sources/meta-yoe/recipes-support/updater/files/imx8qm-var-som/platform b/sources/meta-yoe/recipes-support/updater/files/imx8qm-var-som/platform
index a412e811e..5bd0bd6c8 100644
--- a/sources/meta-yoe/recipes-support/updater/files/imx8qm-var-som/platform
+++ b/sources/meta-yoe/recipes-support/updater/files/imx8qm-var-som/platform
@@ -75,7 +75,9 @@ IMX_BOOT_SEEK=32
 
 # Space separated list of dirs to create in /data
 # which is used by volatile-binds during main rootfs boot
-PERSISTENT_BINDS="/etc/ssh"
+PERSISTENT_BINDS=""
+
+MOUNT_BOOT=1
 
 plat_init() {
   msg "Running $PLAT initializations ..."
diff --git a/sources/meta-yoe/recipes-support/updater/files/imx8qxp-var-som/platform b/sources/meta-yoe/recipes-support/updater/files/imx8qxp-var-som/platform
index d629a1821..9dacbcf14 100644
--- a/sources/meta-yoe/recipes-support/updater/files/imx8qxp-var-som/platform
+++ b/sources/meta-yoe/recipes-support/updater/files/imx8qxp-var-som/platform
@@ -68,7 +68,9 @@ IMX_BOOT_SEEK=32
 
 # Space separated list of dirs to create in /data
 # which is used by volatile-binds during main rootfs boot
-PERSISTENT_BINDS="/etc/ssh"
+PERSISTENT_BINDS=""
+
+MOUNT_BOOT=1
 
 plat_init() {
   msg "Running $PLAT initializations ..."
diff --git a/sources/meta-yoe/recipes-support/updater/files/odroid-c4-hardkernel/platform b/sources/meta-yoe/recipes-support/updater/files/odroid-c4-hardkernel/platform
index 38c1d8048..665d2f518 100644
--- a/sources/meta-yoe/recipes-support/updater/files/odroid-c4-hardkernel/platform
+++ b/sources/meta-yoe/recipes-support/updater/files/odroid-c4-hardkernel/platform
@@ -83,11 +83,13 @@ BOOT_FSTYPE=vfat
 UPDATER_SPEECH=0
 UPDATER_CAN_PARTITION=0
 # OVERLAY_TYPE is one of 'tmpfs' or 'persistent'
-OVERLAY_TYPE=persistent
+# OVERLAY_TYPE=persistent
 # Space separated list of dirs to create in /data
 # which is used by volatile-binds during main rootfs boot
 PERSISTENT_BINDS=""
 
+MOUNT_BOOT=1
+
 plat_init() {
   msg "Running $PLAT initializations ..."
   cat /proc/cpuinfo | grep Revision | cut -d' ' -f 2 > /etc/hwrevision
diff --git a/sources/meta-yoe/recipes-support/updater/files/raspberrypi2/platform b/sources/meta-yoe/recipes-support/updater/files/raspberrypi2/platform
index 67aa45d74..1c5b7a4a8 100644
--- a/sources/meta-yoe/recipes-support/updater/files/raspberrypi2/platform
+++ b/sources/meta-yoe/recipes-support/updater/files/raspberrypi2/platform
@@ -142,6 +142,8 @@ OVERLAY_TYPE=persistent
 # which is used by volatile-binds during main rootfs boot
 PERSISTENT_BINDS=""
 
+MOUNT_BOOT=1
+
 plat_init() {
   msg "Running $PLAT initializations ..."
   cat /proc/cpuinfo | grep Revision | cut -d' ' -f 2 > /etc/hwrevision
diff --git a/sources/meta-yoe/recipes-support/updater/files/raspberrypi3/platform b/sources/meta-yoe/recipes-support/updater/files/raspberrypi3/platform
index b1377f6b3..047f5ffe8 100644
--- a/sources/meta-yoe/recipes-support/updater/files/raspberrypi3/platform
+++ b/sources/meta-yoe/recipes-support/updater/files/raspberrypi3/platform
@@ -142,6 +142,8 @@ OVERLAY_TYPE=persistent
 # which is used by volatile-binds during main rootfs boot
 PERSISTENT_BINDS=""
 
+MOUNT_BOOT=1
+
 plat_init() {
   msg "Running $PLAT initializations ..."
   cat /proc/cpuinfo | grep Revision | cut -d' ' -f 2 > /etc/hwrevision
diff --git a/sources/meta-yoe/recipes-support/updater/files/raspberrypi4-64/platform b/sources/meta-yoe/recipes-support/updater/files/raspberrypi4-64/platform
index 4e8d6ff7d..8b7202141 100644
--- a/sources/meta-yoe/recipes-support/updater/files/raspberrypi4-64/platform
+++ b/sources/meta-yoe/recipes-support/updater/files/raspberrypi4-64/platform
@@ -129,6 +129,8 @@ OVERLAY_TYPE=persistent
 # which is used by volatile-binds during main rootfs boot
 PERSISTENT_BINDS=""
 
+MOUNT_BOOT=1
+
 plat_init() {
   msg "Running $PLAT initializations ..."
   cat /proc/cpuinfo | grep Revision | cut -d' ' -f 2 > /etc/hwrevision
diff --git a/sources/meta-yoe/recipes-support/updater/files/raspberrypi4/platform b/sources/meta-yoe/recipes-support/updater/files/raspberrypi4/platform
index 18a1676d3..7b31fd892 100644
--- a/sources/meta-yoe/recipes-support/updater/files/raspberrypi4/platform
+++ b/sources/meta-yoe/recipes-support/updater/files/raspberrypi4/platform
@@ -141,6 +141,8 @@ OVERLAY_TYPE=persistent
 # which is used by volatile-binds during main rootfs boot
 PERSISTENT_BINDS=""
 
+MOUNT_BOOT=1
+
 plat_init() {
   msg "Running $PLAT initializations ..."
   cat /proc/cpuinfo | grep Revision | cut -d' ' -f 2 > /etc/hwrevision
diff --git a/sources/meta-yoe/recipes-support/updater/files/updater.installer b/sources/meta-yoe/recipes-support/updater/files/updater.installer
index e64731175..d2dffdf9a 100644
--- a/sources/meta-yoe/recipes-support/updater/files/updater.installer
+++ b/sources/meta-yoe/recipes-support/updater/files/updater.installer
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=20.5
+VERSION=21.3
 
 . ./platform
 
@@ -71,7 +71,6 @@ msg_splash() {
 rescue_shell() {
   msg "$@"
   msg "Something went wrong. Dropping you to a shell."
-  busybox --install -s
   exec /bin/sh
 }
 
@@ -348,7 +347,12 @@ mount_rootfs_sd() {
     fi
   fi
 
-  #mount_boot /mnt/boot $SD_BOOT_DEV
+  if [ "$MOUNT_BOOT" = "1" ]; then
+    msg_splash "mounting boot"
+    mount_boot /mnt/boot $SD_BOOT_DEV
+    mount -n --move /mnt/boot $FINAL_ROOTFS/boot
+  fi
+
   mount_data /mnt/data $SD_DATA_DEV
   if [ "$OVERLAY_TYPE" = "persistent" ]; then
     msg_splash "Mounting filesystem overlay on data partition"
@@ -371,7 +375,12 @@ mount_rootfs_emmc() {
     fi
   fi
 
-  #mount_boot /mnt/boot $EMMC_BOOT_DEV
+  if [ "$MOUNT_BOOT" = "1" ]; then
+    msg_splash "mounting boot"
+    mount_boot /mnt/boot $EMMC_BOOT_DEV
+    mount -n --move /mnt/boot $FINAL_ROOTFS/boot
+  fi
+
   mount_data /mnt/data $EMMC_DATA_DEV
   if [ "$OVERLAY_TYPE" = "persistent" ]; then
     msg_splash "Mounting filesystem overlay on data partition"
@@ -500,7 +509,14 @@ find_update_file() {
   cd - >/dev/null
 }
 
+check_rescue_shell() {
+  if [ -f $1/rescue-shell ]; then
+    rescue_shell
+  fi
+}
+
 update_from_usb() {
+  check_rescue_shell $USB_MOUNT_POINT
   update_file=$(find_update_file $USB_MOUNT_POINT)
   if [ "$update_file" != "" ]; then
     speak "updater, found u s b disk"
@@ -522,6 +538,7 @@ update_from_usb() {
 }
 
 update_from_sd() {
+  check_rescue_shell $SD_MOUNT_POINT
   update_file=$(find_update_file $SD_MOUNT_POINT)
   if [ "$update_file" != "" ]; then
     speak "update found on S D card"
@@ -543,6 +560,7 @@ update_from_sd() {
 }
 
 update_from_data() {
+  check_rescue_shell $DATA_MOUNT_POINT
   update_file=$(find_update_file $DATA_MOUNT_POINT)
   if [ "$update_file" != "" ]; then
     speak "update found on data partition"
diff --git a/sources/meta-yoe/recipes-support/updater/files/visionfive2/platform b/sources/meta-yoe/recipes-support/updater/files/visionfive2/platform
index 7ac3a2c1c..39ae1804f 100644
--- a/sources/meta-yoe/recipes-support/updater/files/visionfive2/platform
+++ b/sources/meta-yoe/recipes-support/updater/files/visionfive2/platform
@@ -61,7 +61,9 @@ UPDATER_CAN_PARTITION=0
 
 # Space separated list of dirs to create in /data
 # which is used by volatile-binds during main rootfs boot
-PERSISTENT_BINDS="/etc/ssh"
+PERSISTENT_BINDS=""
+
+MOUNT_BOOT=1
 
 plat_init() {
   msg "Running $PLAT initializations ..."