diff --git a/common/ubuntu_cleanup.sh b/common/ubuntu_cleanup.sh
index 8f49d30..63a7586 100644
--- a/common/ubuntu_cleanup.sh
+++ b/common/ubuntu_cleanup.sh
@@ -4,7 +4,7 @@
 apt-get -y autoremove --purge
 apt-get -y clean
 
-rm -rf /var/lib/apt/lists/*
+rm -rf /var/lib/apt/lists/* || true
 rm -rv /etc/apt/sources.list.d/* || true
 rm -rv /etc/apt/preferences.d/* || true
 echo > /etc/apt/sources.list  || true
@@ -35,6 +35,9 @@
 echo "cleaning up /var/cache/{apt,salt}/*"
 rm -rf /var/cache/{apt,salt}/* || true
 
+rm -rf /root/.cache || true
+rm -rf /root/.ssh/known_hosts || true
+
 # Remove flags
 rm -v /done_ubuntu_base || true
 rm -v /done_ubuntu_salt_bootstrap || true