diff --git a/Containerfile b/Containerfile
index 06c0a94..94a3b2e 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,4 +1,5 @@
-FROM docker.io/archlinux:base-devel
+# FROM docker.io/archlinux:base-devel
+FROM quay.io/archlinux/archlinux:base-devel
 
 LABEL Description="Container to build archlinux packages"
 
diff --git a/Makefile b/Makefile
index 0241c79..464eef1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,4 +4,5 @@ build:
 	podman build -t aur_builder:latest -t aur_builder:`date -I` .
 
 pull:
-	podman pull docker.io/archlinux:base-devel
+	# podman pull docker.io/archlinux:base-devel
+	podman pull quay.io/archlinux/archlinux:base-devel
diff --git a/run.sh b/run.sh
index 2ec65af..fb37e39 100755
--- a/run.sh
+++ b/run.sh
@@ -2,6 +2,11 @@
 
 set -xeuo pipefail
 
+if [[ ! -f /w/PKGBUILD ]]; then
+		echo "Missing PKGBUILD in /w"
+		exit 1
+fi
+
 #  /etc/hosts is managed by podman. Copying or editing with `sed -i` does not seem to work. Only appendig works
 #  podman sets up 169.254.1.2 to be the ip of the host
 sudo sh -c 'echo "169.254.1.2  archmirror.i.balki.me" >> /etc/hosts'