diff --git a/Dockerfile b/Dockerfile
index bd62ed4..4b34617 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=debian:bullseye
+ARG BASE_IMAGE=debian:buster
 FROM ${BASE_IMAGE}
 
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/build-docker.sh b/build-docker.sh
index 79032a5..7c93873 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -75,7 +75,7 @@ fi
 # Modify original build-options to allow config file to be mounted in the docker container
 BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')"
 
-BASE_IMAGE=debian:bullseye
+BASE_IMAGE=debian:buster
 ${DOCKER} build --build-arg BASE_IMAGE=${BASE_IMAGE} -t pi-gen "${DIR}"
 
 if [ "${CONTAINER_EXISTS}" != "" ]; then
diff --git a/stage1/03-install-packages/00-packages b/stage1/03-install-packages/00-packages
index 73edcc9..e8c148c 100644
--- a/stage1/03-install-packages/00-packages
+++ b/stage1/03-install-packages/00-packages
@@ -1 +1 @@
-libraspberrypi-bin libraspberrypi0
+libraspberrypi-bin libraspberrypi0 raspi-config