diff --git a/elements/dpkg/cleanup.d/99-clean-up-cache b/elements/dpkg/cleanup.d/99-clean-up-cache
new file mode 100755
index 00000000..b01509b2
--- /dev/null
+++ b/elements/dpkg/cleanup.d/99-clean-up-cache
@@ -0,0 +1,9 @@
+#!/bin/bash
+# Do an apt-get clean. This will free some space.
+
+set -eu
+set -o pipefail
+
+if ! chroot ${TARGET_ROOT} mount | grep /var/cache/apt/archives; then
+    sudo chroot ${TARGET_ROOT} apt-get clean
+fi
diff --git a/elements/dpkg/post-install.d/99-clean-up-cache b/elements/dpkg/post-install.d/99-clean-up-cache
deleted file mode 100755
index 487c3474..00000000
--- a/elements/dpkg/post-install.d/99-clean-up-cache
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-# Do an apt-get clean. This will free some space.
-
-set -eu
-set -o pipefail
-
-if ! mount | grep /var/cache/apt/archives; then
-    apt-get clean
-fi