diff --git a/library/roles/ubuntu-deb-general/tasks/dist-upgrade.yml b/library/roles/ubuntu-deb-general/tasks/dist-upgrade.yml
index 2be56a8c..400bcae5 100644
--- a/library/roles/ubuntu-deb-general/tasks/dist-upgrade.yml
+++ b/library/roles/ubuntu-deb-general/tasks/dist-upgrade.yml
@@ -1,6 +1,6 @@
 ---
 - name: Dist upgrade, if requested
-  apt: upgrade=dist update_cache=yes cache_valid_time=1800
+  apt: upgrade=dist update_cache=yes cache_valid_time=1800 autoclean=yes autoremove=yes
   when: dist_upgrade
   tags: [ 'packages', 'upgrade', 'dist_upgrade' ]