diff --git a/scripts/00-update b/scripts/00-update
index 2e27d9952c027f68987c44e63f62bb63b2c1cd32..502f1a25d07ca49669f894eef9c847a6d7e86b28 100755
--- a/scripts/00-update
+++ b/scripts/00-update
@@ -95,6 +95,12 @@ chroot "$CHROOTDIR" apt-get -y --force-yes update
 # rest of the process
 chroot "$CHROOTDIR" apt-get -y --force-yes install le-autoupgrade
 
+# Avoid grub-probe errors
+cp -f "$CHROOTDIR"/usr/sbin/grub-probe "$CHROOTDIR"/usr/sbin/grub-probe.tmp
+echo "#!/bin/bash" > "$CHROOTDIR"/usr/sbin/grub-probe
+echo "exit 0" >> "$CHROOTDIR"/usr/sbin/grub-probe
+chmod a+x "$CHROOTDIR"/usr/sbin/grub-probe
+
 closeChroot
 
 exit 0
diff --git a/scripts/40-configure_le5 b/scripts/40-configure_le5
index 898f62a596eec2d9517531d415a1e8f922698aa8..031b062197d90ff405e7a44b826ffa1e29964567 100755
--- a/scripts/40-configure_le5
+++ b/scripts/40-configure_le5
@@ -96,6 +96,8 @@ chroot $CHROOTDIR dpkg-reconfigure le-greeter
 cp -f "$TEMPLATES"/casper/10adduser \
     "$CHROOTDIR"/usr/share/initramfs-tools/scripts/casper-bottom/10adduser
 
+mv "$CHROOTDIR"/usr/sbin/grub-probe.tmp "$CHROOTDIR"/usr/sbin/grub-probe
+
 # Sets deb-conf install command
 sed -i 's@Ubuntu@LE@g' "$CDDIR"/preseed/ubuntu.seed
 sed -i 's@ubuntu@le@g' "$CDDIR"/preseed/ubuntu.seed
diff --git a/scripts/40-configure_minicom b/scripts/40-configure_minicom
index 708a148e5f84d59c6d37229eb300e38936d1b334..08f6eb62b20df13feb43a603abc8566f62f8010e 100755
--- a/scripts/40-configure_minicom
+++ b/scripts/40-configure_minicom
@@ -95,6 +95,8 @@ esac
 
 echo "export \"FLAVOUR=le5\"" >> "$CHROOTDIR"/etc/casper.conf
 
+mv "$CHROOTDIR"/usr/sbin/grub-probe.tmp "$CHROOTDIR"/usr/sbin/grub-probe
+
 # Sets deb-conf install command
 sed -i 's@Ubuntu@LE@g' "$CDDIR"/preseed/ubuntu.seed
 sed -i 's@ubuntu@le@g' "$CDDIR"/preseed/ubuntu.seed