diff --git a/entrypoint.sh b/entrypoint.sh
index d81a36f..df994ef 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -39,16 +39,12 @@ trap unlock EXIT INT TERM
 
 echo "Pulling Repository"
 (
-	mcli mirror --overwrite s3/repo/x86_64 /repo &>/dev/null
-	rm "/repo/${AUR_REPO_NAME}.db"
-	rm "/repo/${AUR_REPO_NAME}.db.sig"
-	rm "/repo/${AUR_REPO_NAME}.files"
-	# rm "/repo/${AUR_REPO_NAME}.files.sig"
-	ln -sf "/repo/${AUR_REPO_NAME}.db.tar.xz" "/repo/${AUR_REPO_NAME}.db"
-	ln -sf "/repo/${AUR_REPO_NAME}.files.tar.xz" "/repo/${AUR_REPO_NAME}.files"
-	ln -sf "/repo/${AUR_REPO_NAME}.db.tar.xz.sig" "/repo/${AUR_REPO_NAME}.db.sig"
-	ln -sf "/repo/${AUR_REPO_NAME}.files.tar.xz.sig" "/repo/${AUR_REPO_NAME}.files.sig"
-) &>/dev/null 
+	mcli cp "s3/repo/x86_64/${AUR_REPO_NAME}.db.tar.xz" /repo
+	mcli cp "s3/repo/x86_64/${AUR_REPO_NAME}.db.tar.xz.sig" /repo
+	mcli cp "s3/repo/x86_64/${AUR_REPO_NAME}.files.tar.xz" /repo
+	mcli cp "s3/repo/x86_64/${AUR_REPO_NAME}.files.tar.xz.sig" /repo
+
+) &>/dev/null
 
 if ! (aur repo >/dev/null 2>&1); then
 	printf "Aur repo not initialized, initializing /repo...\n"
@@ -81,7 +77,7 @@ find . -name PKGBUILD -execdir sh -c 'makepkg --printsrcinfo > .SRCINFO' \;
 find . -iname PKGBUILD -exec dirname {} \; | aur srcver --no-prepare - >vcs
 
 # Rebuild all git packages
-if [ ! -z "$NO_GIT_REBUILD" ]; then
+if [ -z "${NO_GIT_REBUILD:-}" ]; then
 	cut -f1 vcs | grep -e "-git$" | tee -a buildqueue
 fi
 
diff --git a/pacman.conf b/pacman.conf
index daf30b5..0d0585f 100644
--- a/pacman.conf
+++ b/pacman.conf
@@ -91,6 +91,7 @@ Include = /etc/pacman.d/mirrorlist
 [rad4day]
 SigLevel = Never
 Server = file:///repo
+Server = https://repo.tobiasmanske.de/os/$arch/
 
 [options]
 NoExtract  = usr/share/help/* !usr/share/help/en*