diff --git a/build-docker.sh b/build-docker.sh
index a7f18f136f..9d0bff60e5 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -78,10 +78,17 @@ BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')"
 # Check the arch of the machine we're running on. If it's 64-bit, use a 32-bit base image instead
 case "$(uname -m)" in
   x86_64|aarch64)
+<<<<<<< HEAD
     BASE_IMAGE=i386/debian:bullseye
     ;;
   *)
     BASE_IMAGE=debian:bullseye
+=======
+    BASE_IMAGE=i386/debian:buster
+    ;;
+  *)
+    BASE_IMAGE=debian:buster
+>>>>>>> Automagically use i386/debian:buster (#415)
     ;;
 esac
 ${DOCKER} build --build-arg BASE_IMAGE=${BASE_IMAGE} -t pi-gen "${DIR}"