diff --git a/cleanup_image b/cleanup_image
index 273eff7..1e94070 100755
--- a/cleanup_image
+++ b/cleanup_image
@@ -17,13 +17,15 @@ fi
 ls -als $IMG
 mount -o loop $IMG mnt || exit 1
 INSTALLDIR=`pwd`/mnt/
+rm -f $INSTALLDIR/var/lib/rpm/__db.00* $INSTALLDIR/var/lib/rpm/.rpm.lock
 yum -c $PWD/yum.conf clean packages --installroot=$INSTALLDIR
 
 # Make sure that rpm database has right format (for rpm version in template, not host)
 echo "--> Rebuilding rpm database..."
 chroot `pwd`/mnt /bin/rpm --rebuilddb
 
-dd if=/dev/zero of=mnt/fillme bs=1M || true
+echo "--> Compacting image file..."
+dd if=/dev/zero of=mnt/fillme bs=1M 2> /dev/null || true
 sync
 rm mnt/fillme
 umount mnt