diff --git a/ubuntu-16.04/scripts/base.sh b/ubuntu-16.04/scripts/base.sh
index 67e82f3..76fb4b3 100644
--- a/ubuntu-16.04/scripts/base.sh
+++ b/ubuntu-16.04/scripts/base.sh
@@ -3,6 +3,8 @@
 echo "exit 101" > /usr/sbin/policy-rc.d
 chmod +x /usr/sbin/policy-rc.d
 
+echo "Acquire::CompressionTypes::Order gz;" >/etc/apt/apt.conf.d/99compression-workaround-salt
+
 # Overwrite default mirrors
 echo "deb mirror://mirrors.ubuntu.com/mirrors.txt xenial main restricted multiverse universe" > /etc/apt/sources.list
 echo "deb mirror://mirrors.ubuntu.com/mirrors.txt xenial-updates main restricted multiverse universe" >> /etc/apt/sources.list
diff --git a/ubuntu-16.04/scripts/cleanup.sh b/ubuntu-16.04/scripts/cleanup.sh
index 4bc6fcc..4358105 100644
--- a/ubuntu-16.04/scripts/cleanup.sh
+++ b/ubuntu-16.04/scripts/cleanup.sh
@@ -1,5 +1,6 @@
 apt-get -y autoremove --purge
 apt-get -y clean
+rm -f /var/lib/apt/lists/*
 
 rm -f /usr/sbin/policy-rc.d || true