diff --git a/makepkg-podman b/makepkg-podman
index 0e4243d..2ba67dc 100755
--- a/makepkg-podman
+++ b/makepkg-podman
@@ -7,7 +7,7 @@ mkdir "/tmp/$did"
 pkg_dest=$1
 pkg_url=$2
 
-podman run --rm -v "/tmp/$did:/buildroot" "autobuilder:latest" /build "$pkg_url"
+podman run --userns=keep-id --rm -v "/tmp/$did:/buildroot" "autobuilder:spark" /build "$pkg_url"
 
 artifacts=( "/tmp/$did/"*.pkg.* )
 for i in "${artifacts[@]}"; do
@@ -24,5 +24,4 @@ for i in "${artifacts[@]}"; do
 done
 
 # cleanup
-#podman rmi "$did"
-#rm -rf "/tmp/$did"
+rm -rf "/tmp/$did"