diff --git a/tools/install_pi5 b/tools/install_pi5
index 1dfc4af..b13ffb1 100755
--- a/tools/install_pi5
+++ b/tools/install_pi5
@@ -28,7 +28,7 @@
     cnt=10
     while test $cnt -gt 0; do
         echo counter: $cnt
-	sudo -E apt update && cnt=-1 || sleep 7; let cnt=$cnt-1
+	sudo -E apt update --assume-yes && cnt=-1 || sleep 7; let cnt=$cnt-1
 	sync
     done
 
@@ -38,7 +38,7 @@
     cnt=10
     while test $cnt -gt 0; do
         echo counter: $cnt
-	sudo -E apt upgrade && cnt=-1 || sleep 7; let cnt=$cnt-1
+	sudo -E apt upgrade --assume-yes && cnt=-1 || sleep 7; let cnt=$cnt-1
 	sync
     done
 
diff --git a/tools/prepareimage_pi5.sh b/tools/prepareimage_pi5.sh
index 3f3f77f..492bbe8 100755
--- a/tools/prepareimage_pi5.sh
+++ b/tools/prepareimage_pi5.sh
@@ -56,7 +56,8 @@ SRCPATH=`dirname $0`
     echo "install autorun script:"
     sudo cp pi/autorun_pi5 "$2/home/pi/autorun"
     sudo chmod a+x  "$2/home/pi/autorun"
-    sudo chown pi:pi "$2/home/pi/autorun"
+    # The next line does not work on host system:
+    #sudo chown pi:pi "$2/home/pi/autorun"
 
     echo "register autorun script in /etc/rc.local:"
     sudo sed -i -e '/exit 0/ d' -e '/.*autorun.*autorun/ d' -e '/.*home.pi.install.*home.pi.install/ d' -i "$2/etc/rc.local"