diff --git a/meta-citadel/conf/distro/citadel-distro.conf b/meta-citadel/conf/distro/citadel-distro.conf
index fed38c8..0b54442 100644
--- a/meta-citadel/conf/distro/citadel-distro.conf
+++ b/meta-citadel/conf/distro/citadel-distro.conf
@@ -5,6 +5,11 @@ DISTRO_VERSION = "1.0"
 CITADEL_DEFAULT_DISTRO_FEATURES = "acl alsa argp bluetooth ext2 largefile systemd usbhost wifi xattr pci x11 usrmerge wayland opengl pam polkit seccomp"
 DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${CITADEL_DEFAULT_DISTRO_FEATURES}"
 
+PREMIRRORS:prepend = "\
+    git://.*/.* https://mirror.subgraph.com/ \
+    ftp://.*/.* https://mirror.subgraph.com/ \
+    http://.*/.* https://mirror.subgraph.com/ \
+    https://.*/.* https://mirror.subgraph.com/"
 
 HOSTTOOLS_NONFATAL += "inkscape"
 #
diff --git a/realmfs-builder/stage-one.sh b/realmfs-builder/stage-one.sh
index 1bab589..d993130 100755
--- a/realmfs-builder/stage-one.sh
+++ b/realmfs-builder/stage-one.sh
@@ -1,4 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -o errexit
+set -o nounset
+set -o xtrace
 
 : ${REALMFS_BUILDER_BASE:="/usr/share/realmfs-builder"}
 source ${REALMFS_BUILDER_BASE}/common.inc
@@ -153,6 +156,7 @@ try_config() {
 }
     
 WORKDIR="$(pwd)/realmfs"
+BUILDFILE=""
 
 DO_TAR=0
 DO_XZ=0
diff --git a/realmfs-builder/stage-two.sh b/realmfs-builder/stage-two.sh
index 4babc7c..eac86d8 100755
--- a/realmfs-builder/stage-two.sh
+++ b/realmfs-builder/stage-two.sh
@@ -1,4 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -o errexit
+set -o nounset
+set -o xtrace
 
 REALMFS_BUILDER_BASE="/usr/share/realmfs-builder"
 
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index e2e8e4a..c99312a 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster
+FROM debian:bookworm-20240513-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -14,7 +14,6 @@ RUN apt update && apt install -y gawk \
     chrpath \
     socat \
     cpio \
-    python \
     python3 \
     python3-pip \
     python3-pexpect \
@@ -25,10 +24,12 @@ RUN apt update && apt install -y gawk \
     libgmp-dev \
     libmpc-dev \
     libelf-dev \
-    nano \
+    vim \
     sudo \
     debootstrap \
-    inkscape \
+    file \
+    liblz4-tool \
+    zstd \
     xwayland
 
 # python