diff --git a/Makefile b/Makefile
index 387ed80..36c37e7 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,8 @@ update-repo-installer:
 clean:
 	sudo rm -fr qubeized_images/root.img.*
 	sudo rm -fr qubeized_images/$(TEMPLATE_NAME)*
-	sudo rm -fr rpmbuild/*
+	sudo rm -fr rpmbuild/BUILDROOT/*
+	sudo rm -fr rpmbuild/tmp/*
 	# We're not removing any images from fedorized_images/ intentionally
 	# because the user might want to keep using the same image for a long time
 	# and they are not dependent on any of the Qubes packahes
diff --git a/cleanup_image b/cleanup_image
index b40f0b6..dbc35f3 100755
--- a/cleanup_image
+++ b/cleanup_image
@@ -15,7 +15,7 @@ fi
 ls -als $IMG
 mount -o loop $IMG mnt || exit 1
 INSTALLDIR=`pwd`/mnt/
-yum clean packages --installroot=$INSTALLDIR 
+yum -c $PWD/yum.conf clean packages --installroot=$INSTALLDIR
 dd if=/dev/zero of=mnt/fillme bs=1M
 sync
 rm mnt/fillme