diff --git a/build-all.sh b/build-all.sh
index 733eb5b..592ebb2 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -14,8 +14,8 @@ set -e
     ./build-one.sh vulkan-docs-base 202206 "$@"
     ./build-one.sh vulkan-docs 202206 "$@"
     ./build-one.sh rust 202312 "$@"
-    ./build-one.sh openxr 20240412 "$@"
-    ./build-one.sh openxr-sdk 20240412 "$@"
-    ./build-one.sh openxr-pregenerated-sdk 20240412 "$@"
-    ./build-one.sh openxr-android 20240412 "$@"
+    ./build-one.sh openxr 20240924 "$@"
+    ./build-one.sh openxr-sdk 20240924 "$@"
+    ./build-one.sh openxr-pregenerated-sdk 20240924 "$@"
+    ./build-one.sh openxr-android 20240924 "$@"
 )
diff --git a/openxr-pregenerated-sdk.Dockerfile b/openxr-pregenerated-sdk.Dockerfile
index 63a923d..0a67682 100644
--- a/openxr-pregenerated-sdk.Dockerfile
+++ b/openxr-pregenerated-sdk.Dockerfile
@@ -55,9 +55,11 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
     wget \
     gcc-multilib \
     g++-multilib \
-    linux-libc-dev:i386 \
+    libelf-dev:i386 \
     libgl1-mesa-dev:i386 \
     libvulkan-dev:i386 \
+    libwayland-dev:i386 \
+    libx11-dev:i386 \
     libx11-xcb-dev:i386 \
     libxcb-dri2-0-dev:i386 \
     libxcb-glx0-dev:i386 \
@@ -66,6 +68,10 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
     libxcb-randr0-dev:i386 \
     libxrandr-dev:i386 \
     libxxf86vm-dev:i386 \
+    linux-libc-dev:i386 \
     mesa-common-dev:i386 \
     && env DEBIAN_FRONTEND=noninteractive apt-get clean \
     && rm -rf /var/lib/apt/lists/*
+
+# Copy in the toolchain file
+COPY i386.cmake /i386.cmake
diff --git a/openxr-sdk.Dockerfile b/openxr-sdk.Dockerfile
index 6d39b5b..4465ec5 100644
--- a/openxr-sdk.Dockerfile
+++ b/openxr-sdk.Dockerfile
@@ -31,6 +31,7 @@ RUN dpkg --add-architecture i386
 # Runtime-required packages
 RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
     env DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -qq \
+    asciidoctor \
     apt-transport-https \
     build-essential \
     ca-certificates \
@@ -89,7 +90,8 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
     libxxf86vm-dev:i386 \
     linux-libc-dev:i386 \
     mesa-common-dev:i386 \
-    && apt-get clean
+    && env DEBIAN_FRONTEND=noninteractive apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 # Copy in the toolchain file
 COPY i386.cmake /i386.cmake