diff --git a/buildroot-external/rootfs-overlay/usr/lib/rauc/post-install b/buildroot-external/rootfs-overlay/usr/lib/rauc/post-install
index f07bc2638..b552daafc 100755
--- a/buildroot-external/rootfs-overlay/usr/lib/rauc/post-install
+++ b/buildroot-external/rootfs-overlay/usr/lib/rauc/post-install
@@ -1,4 +1,3 @@
 #!/bin/sh
 
 systemctl start mnt-boot.mount
-systemctl reboot
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
index 66bde2b66..ac68fc988 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=HassOS supervisor
 Requires=docker.service
-After=docker.service dbus.socket
+After=docker.service rauc.service dbus.socket
 RequiresMountsFor=/mnt/data
 StartLimitIntervalSec=60
 StartLimitBurst=5
diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-config b/buildroot-external/rootfs-overlay/usr/sbin/hassos-config
index e28e51e09..04f6177e1 100755
--- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-config
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-config
@@ -52,7 +52,12 @@ if ls /mnt/config/*.raucb > /dev/null; then
     echo "[Info] Performe a firmware update"
 
     rauc_filename=$(ls /mnt/config/*.raucb | head -n 1)
-    rauc install /mnt/config/$rauc_filename
+    if rauc install /mnt/config/$rauc_filename; then
+        echo "[Info] Firmware update success"
+        systemctl reboot
+    else
+        echo "[Error] Firmware update fails"
+    fi
 fi
 
 # Cleanup config partition