diff --git a/entrypoint.sh b/entrypoint.sh
index 6621537..89de4ce 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -49,18 +49,17 @@ touch buildqueue
 
 git submodule update --remote --merge # Make sure we are up to date if something is linked as a submodule
 #
-# Rebuild all git packages
-aur repo --list
-aur repo --list | awk '{print $1}' | grep -e "-git$" | aur fetch -
 find . -name PKGBUILD -execdir sh -c 'makepkg --printsrcinfo > .SRCINFO' \;
 
-find . -iname PKGBUILD -exec dirname {} \; | aur srcver - > vcs
+# Obtain version of downloaded packages
+find . -iname PKGBUILD -exec dirname {} \; | aur srcver --no-prepare - > vcs
 
+# Rebuild all git packages
+find . -iname "*-git$" -type d | tee -a buildqueue
+
+# add all outdated packages to the build queue
 aur repo --list | aur vercmp -q -p vcs | tee -a buildqueue
 
-aur repo --list | aur vercmp -q | tee -a buildqueue | aur fetch - # pull outdated packages
-
-
 # Build all packages defined in buildqueue
 while read -r i; do
     cat "$i"/.SRCINFO