diff --git a/iso/installer/install.sh b/iso/installer/install.sh
index 96b1eb57..70db8edd 100755
--- a/iso/installer/install.sh
+++ b/iso/installer/install.sh
@@ -165,7 +165,7 @@ myCRONJOBS="
 27 3 * * *      root    systemctl stop tpot && docker stop \$(docker ps -aq) || docker rm \$(docker ps -aq) || reboot
 
 # Check for updated packages every sunday, upgrade and reboot
-27 16 * * 0     root    apt-get autoclean -y && apt-get autoremove -y && apt-get update -y && apt-get upgrade -y && sleep 10 && reboot
+27 16 * * 0     root    apt-fast autoclean -y && apt-fast autoremove -y && apt-fast update -y && apt-fast upgrade -y && sleep 10 && reboot
 "
 myROOTPROMPT='PS1="\[\033[38;5;8m\][\[$(tput sgr0)\]\[\033[38;5;1m\]\u\[$(tput sgr0)\]\[\033[38;5;6m\]@\[$(tput sgr0)\]\[\033[38;5;4m\]\h\[$(tput sgr0)\]\[\033[38;5;6m\]:\[$(tput sgr0)\]\[\033[38;5;5m\]\w\[$(tput sgr0)\]\[\033[38;5;8m\]]\[$(tput sgr0)\]\[\033[38;5;1m\]\\$\[$(tput sgr0)\]\[\033[38;5;15m\] \[$(tput sgr0)\]"'
 myUSERPROMPT='PS1="\[\033[38;5;8m\][\[$(tput sgr0)\]\[\033[38;5;2m\]\u\[$(tput sgr0)\]\[\033[38;5;6m\]@\[$(tput sgr0)\]\[\033[38;5;4m\]\h\[$(tput sgr0)\]\[\033[38;5;6m\]:\[$(tput sgr0)\]\[\033[38;5;5m\]\w\[$(tput sgr0)\]\[\033[38;5;8m\]]\[$(tput sgr0)\]\[\033[38;5;2m\]\\$\[$(tput sgr0)\]\[\033[38;5;15m\] \[$(tput sgr0)\]"'
@@ -296,8 +296,8 @@ EOF
   echo
   apt-fast -y install $myINSTALLPACKAGES
   # Remove exim4
-  apt-get -y purge exim4-base mailutils
-  apt-get -y autoremove
+  apt-fast -y purge exim4-base mailutils
+  apt-fast -y autoremove
   apt-mark hold exim4-base mailutils
 }
 
@@ -820,8 +820,8 @@ fuBANNER "Update IP"
 
 # Let's clean up apt
 fuBANNER "Clean up"
-apt-get autoclean -y
-apt-get autoremove -y
+apt-fast autoclean -y
+apt-fast autoremove -y
 
 # Final steps
 cp /opt/tpot/host/etc/rc.local /etc/rc.local && \
diff --git a/update.sh b/update.sh
index b78eced6..54080aa7 100755
--- a/update.sh
+++ b/update.sh
@@ -181,8 +181,8 @@ echo "### Installing apt-fast"
 local myPACKAGES="aria2 apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker console-setup console-setup-linux curl debconf-utils dialog dnsutils docker.io docker-compose dstat ethtool fail2ban figlet genisoimage git glances grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 man mosh multitail netselect-apt net-tools npm ntp openssh-server openssl pass prips software-properties-common syslinux psmisc pv python-pip toilet unattended-upgrades unzip vim wget wireless-tools wpasupplicant"
 echo "### Now upgrading packages ..."
 dpkg --configure -a
-apt-get -y autoclean
-apt-get -y autoremove
+apt-fast -y autoclean
+apt-fast -y autoremove
 apt-fast update
 apt-fast -y install $myPACKAGES
 
@@ -195,7 +195,7 @@ npm install "https://github.com/taskrabbit/elasticsearch-dump" -g
 pip install --upgrade pip
 hash -r
 pip install --upgrade elasticsearch-curator yq
-apt-get -y purge exim4-base mailutils
+apt-fast -y purge exim4-base mailutils
 apt-mark hold exim4-base mailutils
 echo