diff --git a/FAQ.dev.md b/FAQ.dev.md
index 25ba53ca9..dbe805351 100644
--- a/FAQ.dev.md
+++ b/FAQ.dev.md
@@ -12,8 +12,7 @@ Work notes for the process of producing a new SD card image release:
 * From the browser `Show All Downloads` and from the context menu select `Open Containing Folder`
 * On that file manager open context (right click) on the white-space and select `Open in Terminal`
 * Compare the checksum with the one you just made note of, using `shasum -a 256 *.zip`
-* Install curl if needed `sudo apt-get install -f curl net-tools`
-* Check signature: `curl https://www.raspberrypi.org/raspberrypi_downloads.gpg.key | gpg --import && gpg --verify *.sig`
+* Check signature: `wget https://www.raspberrypi.org/raspberrypi_downloads.gpg.key && gpg --import ./raspberrypi_downloads.gpg.key && gpg --verify *.sig`
 * The result should say "correct signature" and the fingerprint should end with `8738 CD6B 956F 460C`
 * Insert an NTFS formatted USB stick and use the file manager to move all files to the USB
 * If image is an ZIP file use in file manager context on NTFS USB stick `extract here` to unzip
@@ -197,3 +196,15 @@ See article: https://tech.sycamore.garden/add-commit-push-contributor-branch-git
 Chery-picking patch PRs from dev to a release-branch like 'v1.8' (for example) is now a bit more complicated. Either an admin switches temorarly the branch protection "require a pull request before merging" setting off for the `git cherry-pick` OR we create a `p1.8` branch from `v1.8`, cherry-pick the squashed patch PR into that unprotected `p1.8` and then open a PR back to `v1.8`.
 
 But what we gain is that better branch protection and we can add more contributers to the project that are allowed to manage issues - like adding lables or closing.
+
+### How to run the automatic amd64 build on a VM on OSX?
+
+just notes so far:
+
+https://brew.sh
+brew install qemu
+https://github.com/rootzoll/raspiblitz/actions --> download amd64-lean image
+double unzip until `qcow2` file 
+convert `qcow2` to `vdi:
+qemu-img convert -f qcow2 raspiblitz-amd64-debian-lean.qcow2 -O vdi raspiblitz-amd64-debian-lean.vdi
+https://www.virtualbox.org/wiki/Downloads
diff --git a/alternative.platforms/display.alternatives.sh b/alternative.platforms/display.alternatives.sh
index 337773523..d27a16411 100644
--- a/alternative.platforms/display.alternatives.sh
+++ b/alternative.platforms/display.alternatives.sh
@@ -55,7 +55,7 @@ if [ "${CHOICE}" = "GPIO" ]; then
     sudo apt-mark hold raspberrypi-bootloader
     sudo ./LCD35-show
   else
-    sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf
+    sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf 2>/dev/null
     sudo mkdir /etc/X11/xorg.conf.d
     sudo cp ./usr/tft35a-overlay.dtb /boot/overlays/
     sudo cp ./usr/tft35a-overlay.dtb /boot/overlays/tft35a.dtbo
@@ -79,7 +79,7 @@ elif [ "${CHOICE}" = "HDMI" ]; then
   sudo chmod -R 755 LCD-show
   cd LCD-show/
   #sudo ./MPI3508-show  
-  sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf
+  sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf 2>/dev/null
   
   if [ "${baseimage}" != "dietpi" ]; then
     sudo cp -rf ./boot/config-35-480X320.txt /boot/config.txt  
diff --git a/build_sdcard.sh b/build_sdcard.sh
index c704af40d..e9a47d599 100644
--- a/build_sdcard.sh
+++ b/build_sdcard.sh
@@ -856,6 +856,8 @@ echo -e "\nIMPORTANT IF WANT TO MAKE A RELEASE IMAGE FROM THIS BUILD:"
 echo "1. login fresh --> user:admin password:raspiblitz"
 echo -e "2. run --> release\n"
 
+# make sure that at least the code is available (also if no internet)
+sudo /home/admin/config.scripts/blitz.display.sh prepare-install
 # (do last - because might trigger reboot)
 if [ "${display}" != "headless" ] || [ "${baseimage}" = "raspios_arm64" ]; then
   echo "*** ADDITIONAL DISPLAY OPTIONS ***"
diff --git a/ci/arm64-rpi/arm64-rpi.pkr.hcl b/ci/arm64-rpi/arm64-rpi.pkr.hcl
index d183cbda8..8434474fd 100644
--- a/ci/arm64-rpi/arm64-rpi.pkr.hcl
+++ b/ci/arm64-rpi/arm64-rpi.pkr.hcl
@@ -27,7 +27,7 @@ source "arm" "raspiblitz-arm64-rpi" {
     type         = "83"
   }
   image_path                   = "raspiblitz-arm64-rpi-${var.pack}.img"
-  image_size                   = "30G"
+  image_size                   = "28G"
   image_type                   = "dos"
   qemu_binary_destination_path = "/usr/bin/qemu-arm-static"
   qemu_binary_source_path      = "/usr/bin/qemu-arm-static"
diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index b33606603..053e16d12 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -898,6 +898,14 @@ if [ ${configWifiExists} -eq 1 ]; then
   cp /etc/wpa_supplicant/wpa_supplicant.conf /mnt/hdd/app-data/wpa_supplicant.conf
 fi
 
+# always copy the latest display setting (maybe just in raspiblitz.info) to raspiblitz.conf
+if [ "${displayClass}" != "" ]; then
+  /home/admin/config.scripts/blitz.conf.sh set displayClass ${displayClass}
+fi
+if [ "${displayType}" != "" ]; then
+  /home/admin/config.scripts/blitz.conf.sh set displayType ${displayType}
+fi
+
 # make sure users have latest credentials (if lnd is on)
 if [ "${lightning}" == "lnd" ] || [ "${lnd}" == "on" ]; then
   echo "running LND users credentials update" >> $logFile
diff --git a/home.admin/_version.info b/home.admin/_version.info
index 04a6a2616..c818fb0f7 100644
--- a/home.admin/_version.info
+++ b/home.admin/_version.info
@@ -1,2 +1,3 @@
 # RaspiBlitz Version - always [major].[main].[sub] (sub can be a string like '2rc1')
-codeVersion="1.9.0rc1"
\ No newline at end of file
+codeVersion="1.9.0rc1"
+# keep last line with comment
\ No newline at end of file
diff --git a/home.admin/config.scripts/blitz.display.sh b/home.admin/config.scripts/blitz.display.sh
old mode 100755
new mode 100644
index 16bcf7899..268ba455d
--- a/home.admin/config.scripts/blitz.display.sh
+++ b/home.admin/config.scripts/blitz.display.sh
@@ -13,6 +13,7 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
   echo "# sudo blitz.display.sh rotate [on|off]"
   echo "# sudo blitz.display.sh test-lcd-connect"
   echo "# sudo blitz.display.sh set-display [hdmi|lcd|headless]"
+  echo "# sudo blitz.display.sh prepare-install"
   exit 1
 fi
 
@@ -137,9 +138,9 @@ if [ "${command}" == "rotate" ]; then
     # change rotation config
     echo "# Turn ON: LCD ROTATE"
     sed -i "s/^dtoverlay=.*/dtoverlay=waveshare35a:rotate=90/g" /boot/config.txt
-    rm /etc/X11/xorg.conf.d/40-libinput.conf >/dev/null
+    rm /etc/X11/xorg.conf.d/40-libinput.conf 2>/dev/null
 
-    /home/admin/config.scripts/blitz.conf.sh set lcdrotate 1
+    /home/admin/config.scripts/blitz.conf.sh set lcdrotate 1 2>/dev/null
     echo "# OK - a restart is needed: sudo shutdown -r now"
 
   # TURN ROTATE OFF
@@ -164,7 +165,7 @@ EOF
     fi
 
     # update raspiblitz conf
-    /home/admin/config.scripts/blitz.conf.sh set lcdrotate 0  
+    /home/admin/config.scripts/blitz.conf.sh set lcdrotate 0 2>/dev/null
     echo "OK - a restart is needed: sudo shutdown -r now"
 
   else
@@ -196,6 +197,19 @@ if [ "${command}" == "test-lcd-connect" ]; then
    exit 0
 fi
 
+function prepareinstall() {
+  repoCloned=$(sudo -u admin ls /home/admin/wavesharelcd-64bit-rpi/README.md 2>/dev/null| grep -c README.md)
+  if [ ${repoCloned} -lt 1 ]; then
+    echo "# clone/download https://github.com/tux1c/wavesharelcd-64bit-rpi.git"
+    cd /home/admin/
+    sudo -u admin git clone --no-checkout https://github.com/tux1c/wavesharelcd-64bit-rpi.git
+    sudo -u admin chmod -R 755 wavesharelcd-64bit-rpi
+    sudo -u admin chown -R admin:admin wavesharelcd-64bit-rpi
+  else
+    echo "# LCD repo already cloned/downloaded (${repoCloned})"
+  fi
+}
+
 #######################################
 # DISPLAY TYPED INSTALLS & UN-INSTALLS
 # HDMI is the default - every added
@@ -231,11 +245,9 @@ function install_lcd() {
     sudo apt-mark hold raspberrypi-bootloader
 
     # Downloading LCD Driver from Github
-    cd /home/admin/
-    sudo -u admin git clone https://github.com/tux1c/wavesharelcd-64bit-rpi.git
-    sudo -u admin chmod -R 755 wavesharelcd-64bit-rpi
-    sudo -u admin chown -R admin:admin wavesharelcd-64bit-rpi
+    prepareinstall
     cd /home/admin/wavesharelcd-64bit-rpi
+    sudo -u admin git checkout master
     sudo -u admin git reset --hard 5a206a7 || exit 1
     sudo -u admin /home/admin/config.scripts/blitz.git-verify.sh \
      'GitHub' 'https://github.com/web-flow.gpg' '4AEE18F83AFDEB23' || exit 1
@@ -404,6 +416,17 @@ function uninstall_headless() {
   fi
 }
 
+###################
+# PREPARE INSTALL
+# make sure github
+# repo is installed
+###################
+
+if [ "${command}" == "prepare-install" ]; then
+  prepareinstall
+  exit 0
+fi
+
 ###################
 # SET DISPLAY TYPE
 ###################
@@ -458,7 +481,7 @@ if [ "${command}" == "set-display" ]; then
   fi
 
   # mark new display class in config (if exist)
-  /home/admin/config.scripts/blitz.conf.sh set displayClass ${paramDisplayClass}
+  /home/admin/config.scripts/blitz.conf.sh set displayClass ${paramDisplayClass} 2>/dev/null
   sed -i "s/^displayClass=.*/displayClass=${paramDisplayClass}/g" /home/admin/raspiblitz.info
   exit 0