diff --git a/run.sh b/run.sh
index c26d4e4..b4a191b 100755
--- a/run.sh
+++ b/run.sh
@@ -66,9 +66,9 @@ gosu builder getkeys.sh
 # Execute the build itself
 gosu builder makepkg ${MAKEPKG_OPTS[@]}
 
-PACKAGE=($(ls *.pkg.tar.*))
+PACKAGE=($(find . -regextype egrep -regex '^.*\.pkg(|\.tar|\.tar\.xz|\.tar\.zst)$'))
 
-REPODB=$(find /repo -name '*.db.tar.*')
+REPODB=$(find /repo -regextype egrep -regex '^.*\.db(|\.tar|\.tar\.xz|\.tar.zst)$')
 if [ -z "${REPODB}" ]; then
 	echo "No database found in /repo, not adding package."
 	echo "The built package is available in ${PACKAGE}"