diff --git a/bundles/apt/files/upgrade-and-reboot b/bundles/apt/files/upgrade-and-reboot
index 8029b54..4f5d400 100644
--- a/bundles/apt/files/upgrade-and-reboot
+++ b/bundles/apt/files/upgrade-and-reboot
@@ -34,7 +34,7 @@ trap 'rm -f "$softlockdir"/UNATTENDED' EXIT
 
 apt-get update
 
-DEBIAN_FRONTEND=noninteractive apt-get -y -q  -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-confdef dist-upgrade
+DEBIAN_FRONTEND=noninteractive apt-get -y -q -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-confdef dist-upgrade
 
 ret=$?
 if (( $ret != 0 ))
@@ -42,11 +42,11 @@ then
     exit 1
 fi
 
-apt-get autoclean
-apt-get autoremove
+DEBIAN_FRONTEND=noninteractive apt-get -y -q autoclean
+DEBIAN_FRONTEND=noninteractive apt-get -y -q autoremove
 
 if [[ -f /var/run/reboot-required ]]
 then
-    date | mail -s "SYSREBOOTNOW $(cat /etc/node.name)" ${data['mail']}
+    date | mail -s "SYSREBOOTNOW ${node.name}" ${data['mail']}
     systemctl reboot
 fi