diff --git a/headless.apkovl.tar.gz b/headless.apkovl.tar.gz
index d460cfb..4cb13a6 100644
Binary files a/headless.apkovl.tar.gz and b/headless.apkovl.tar.gz differ
diff --git a/overlay/etc/local.d/headless.start b/overlay/etc/local.d/headless.start
index a2fe840..5051436 100755
--- a/overlay/etc/local.d/headless.start
+++ b/overlay/etc/local.d/headless.start
@@ -97,13 +97,6 @@ cat <<-EOF >> /etc/conf.d/sshd
 
 rc-service sshd start
 
-if [ -f "${ovlpath}/unattended.sh" ]; then
-	install -m755 "${ovlpath}/unattended.sh" /tmp/unattended.sh
-	/tmp/unattended.sh >/dev/console 2>&1 &
-	logger -st ${0##*/} "/tmp/unattended.sh script launched in the background with PID $!"
-fi
-
-
 ## Prep for final post-cleanup
 cat <<-EOF > /tmp/.trash/post-cleanup
 	#!/bin/sh
@@ -115,6 +108,12 @@ cat <<-EOF > /tmp/.trash/post-cleanup
 	rc-update del local default
 	rm /etc/local.d/headless.start
 
+	if [ -f "${ovlpath}/unattended.sh" ]; then
+		install -m755 "${ovlpath}/unattended.sh" /tmp/unattended.sh
+		/tmp/unattended.sh >/dev/console 2>&1 &
+		logger -st ${0##*/} "/tmp/unattended.sh script launched in the background with PID \$!"
+	fi
+
 	logger -st ${0##*/} "Done !!"
 	EOF