diff --git a/debian-8/scripts/base.sh b/debian-8/scripts/base.sh
index b3995d2..ebb2c95 100644
--- a/debian-8/scripts/base.sh
+++ b/debian-8/scripts/base.sh
@@ -1,6 +1,8 @@
 ## Base packages and setup
+export DEBIAN_FRONTEND=noninteractive
 echo "exit 101" > /usr/sbin/policy-rc.d
 chmod +x /usr/sbin/policy-rc.d
+apt-get clean
 apt-get update
 
 # Cleanup old kernels, ensure latest is installed via virtual package
diff --git a/ubuntu-14.04/scripts/base.sh b/ubuntu-14.04/scripts/base.sh
index 256da57..1358b64 100644
--- a/ubuntu-14.04/scripts/base.sh
+++ b/ubuntu-14.04/scripts/base.sh
@@ -2,8 +2,10 @@
 # Ensure our repository is the only one present
 echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty main security extra tcp tcp-salt" > /etc/apt/sources.list
 
+export DEBIAN_FRONTEND=noninteractive
 echo "exit 101" > /usr/sbin/policy-rc.d
 chmod +x /usr/sbin/policy-rc.d
+apt-get clean
 apt-get update
 
 # Cleanup old kernels, ensure latest is installed via virtual package
diff --git a/ubuntu-16.04/scripts/base.sh b/ubuntu-16.04/scripts/base.sh
index 764943f..9fb84a0 100644
--- a/ubuntu-16.04/scripts/base.sh
+++ b/ubuntu-16.04/scripts/base.sh
@@ -1,9 +1,11 @@
 ## Base packages and setup
-# Remove unwanted ubuntu security repository
-#sed -i '/.*security\.ubuntu.com.*/d' /etc/apt/sources.list
+# Ensure our repository is the only one present
+#echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial main security extra tcp tcp-salt" > /etc/apt/sources.list
 
+export DEBIAN_FRONTEND=noninteractive
 echo "exit 101" > /usr/sbin/policy-rc.d
 chmod +x /usr/sbin/policy-rc.d
+apt-get clean
 apt-get update
 
 # Cleanup old kernels, ensure latest is installed via virtual package