diff --git a/image_builder b/image_builder
index 1bf93f8..6b51f49 100755
--- a/image_builder
+++ b/image_builder
@@ -131,6 +131,8 @@ function rebuild_build_and_lint()
     $IN_CONTAINER /bin/bash -c "rm -rf /usr/share/i18n"
     $IN_CONTAINER /bin/bash -c "rm -rf /usr/share/locale"
     $IN_CONTAINER /bin/bash -c "rm -rf /usr/share/man"
+    $IN_CONTAINER /bin/bash -c "rm -rf /var/lib/apt/lists/*"
+    $IN_CONTAINER /bin/bash -c "apt remove vim --purge || true"
 
     # Disable apt annoyances
     $IN_CONTAINER systemctl -q disable apt-daily.timer --now
@@ -216,7 +218,9 @@ function rebuild()
     $IN_CONTAINER /bin/bash -c "rm -rf /usr/share/info"
     $IN_CONTAINER /bin/bash -c "rm -rf /usr/share/i18n"
     $IN_CONTAINER /bin/bash -c "rm -rf /usr/share/locale"
+    $IN_CONTAINER /bin/bash -c "rm -rf /usr/share/man"
     $IN_CONTAINER /bin/bash -c "rm -rf /var/lib/apt/lists/*"
+    $IN_CONTAINER /bin/bash -c "apt remove vim --purge || true"
 
     # Disable services that are useless in the vast majority of cases to try to improve perfs
     $IN_CONTAINER systemctl -q disable rspamd --now || true