diff --git a/config-joey.hs b/config-joey.hs
index eca421d..026f209 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -221,6 +221,7 @@ standardSystem hn suite arch = host hn
 	& os (System (Debian suite) arch)
 	& Apt.stdSourcesList suite
 		`onChange` Apt.upgrade
+	& Apt.cacheCleaned
 	& Apt.installed ["etckeeper"]
 	& Apt.installed ["ssh"]
 	& GitHome.installedFor "root"
@@ -245,6 +246,7 @@ standardContainer name suite arch = Docker.container name (dockerImage system)
 	& os (System (Debian suite) arch)
 	& Apt.stdSourcesList suite
 	& Apt.unattendedUpgrades
+	& Apt.cacheCleaned
   where
 	system = System (Debian suite) arch
 
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index d3f47a8..69144d7 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -254,3 +254,9 @@ trustsKey k = RevertableProperty trust untrust
 				hPutStr h (pubkey k)
 				hClose h
 		nukeFile $ f ++ "~" -- gpg dropping
+
+-- | Cleans apt's cache of downloaded packages to avoid using up disk
+-- space.
+cacheCleaned :: Property
+cacheCleaned = cmdProperty "apt-get" ["clean"]
+	`describe` "apt cache cleaned"