diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index dd5889f12..960bfbf3b 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -151,24 +151,6 @@ else
   echo "No SSHRESET switch found. " >> $logFile
 fi
 
-################################
-# BACKGROUND TASK RUN FROM BEGINNING
-# on 1.7 sd card build background task runs after boostrap
-# but bootstrap already needs background task running now
-# REMOVE ON v1.8 release #2328
-################################
-
-backgroundNeedsEdit=$(sudo cat /etc/systemd/system/background.service 2>/dev/null | grep -c 'Wants=bootstrap.service')
-if [ ${backgroundNeedsEdit} -eq 1 ]; then
-  echo "BACKGROUND EDIT needed ..." >> $logFile
-  sudo sed -i "s/^Wants=.*/Wants=network.target/g" /etc/systemd/system/background.service
-  sudo sed -i "s/^After=.*/After=network.target/g" /etc/systemd/system/background.service
-  systemInitReboot=1
-  sed -i "s/^message=.*/message='BACKGROUND EDIT'/g" ${infoFile}
-else
-  echo "BACKGROUND EDIT already done. " >> $logFile
-fi
-
 ################################
 # FS EXPAND
 # if a file called 'ssh.reset' gets
@@ -215,9 +197,8 @@ fi
 
 if [ "${systemInitReboot}" == "1" ]; then
   sudo cp ${logFile} ${logFile}.systeminit
-  sudo sed -i "s/^state=.*/state=initreboot/g" ${infoFile}
-  sleep 60
-  sudo sed -i "s/^state=.*/state=reboot/g" ${infoFile}
+  sudo sed -i "s/^state=.*/state=reboot-init/g" ${infoFile}
+  sleep 6
   sudo shutdown -r now
   sleep 100
   exit 0
@@ -338,10 +319,8 @@ source <(sudo /home/admin/config.scripts/blitz.datadrive.sh uasp-fix)
 if [ "${neededReboot}" == "1" ]; then
   echo "UASP FIX applied (2nd-try) ... reboot needed." >> $logFile
   sudo cp ${logFile} ${logFile}.uasp
-  sudo sed -i "s/^state=.*/state=uaspreboot/g" ${infoFile}
-  sed -i "s/^message=.*/message='UASP2'/g" ${infoFile}
-  sleep 60
   sudo sed -i "s/^state=.*/state=reboot/g" ${infoFile}
+  sleep 6
   sudo shutdown -r now
   sleep 100
   exit 0
@@ -454,7 +433,7 @@ if [ ${isMounted} -eq 0 ]; then
       sed -i "s/^state=.*/state=errorHDD/g" ${infoFile}
       sed -i "s/^message=.*/message='lost HDD - rebooting'/g" ${infoFile}
       sudo cp ${logFile} ${logFile}.error
-      sleep 60
+      sleep 6
       sudo shutdown -r now
       sleep 100
       exit 0
diff --git a/home.admin/assets/background.service b/home.admin/assets/background.service
index 83c6e13c1..b6c5e4d64 100644
--- a/home.admin/assets/background.service
+++ b/home.admin/assets/background.service
@@ -3,8 +3,8 @@
 
 [Unit]
 Description=RaspiBlitz Background Monitoring Service
-Wants=bootstrap.service
-After=bootstrap.service
+Wants=network.target
+After=network.target
 
 # for use with sendmail alert (coming soon)
 #OnFailure=systemd-sendmail@%n
diff --git a/home.admin/setup.scripts/eventInfoWait.sh b/home.admin/setup.scripts/eventInfoWait.sh
index 969fd3a19..05fa4714e 100644
--- a/home.admin/setup.scripts/eventInfoWait.sh
+++ b/home.admin/setup.scripts/eventInfoWait.sh
@@ -58,6 +58,12 @@ elif [ "${eventID}" == "reboot" ]; then
 Shutting down for reboot.
 " 5 30
 
+elif [ "${eventID}" == "reboot-init" ]; then
+
+    dialog --backtitle "${backtitle}" --cr-wrap --infobox "
+Rebooting for Setup (${contentString})
+" 5 30
+
 elif [ "${eventID}" == "error" ] && [ "${mode}" == "lcd" ]; then
 
     dialog --backtitle "${backtitle}" --cr-wrap --infobox "