diff --git a/docker/Dockerfile b/docker/Dockerfile
index cec52600..8edbad58 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -83,14 +83,14 @@ RUN export GIT_ROOT=git-2.47.0 && \
     export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \
     manylinux-entrypoint /build_scripts/build-git.sh
 
-
-FROM build_base AS build_cpython_system_ssl
+FROM build_base AS build_sqlite3
 COPY build_scripts/build-sqlite3.sh /build_scripts/
 RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3470000 && \
     export SQLITE_AUTOCONF_HASH=83eb21a6f6a649f506df8bd3aab85a08f7556ceed5dbd8dea743ea003fc3a957 && \
     export SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2024 && \
     manylinux-entrypoint /build_scripts/build-sqlite3.sh
 
+FROM build_base AS build_tcl_tk
 COPY build_scripts/build-tcltk.sh /build_scripts/
 RUN export TCL_ROOT=tcl8.6.14 && \
     export TCL_HASH=5880225babf7954c58d4fb0f5cf6279104ce1cd6aa9b71e9a6322540e1c4de66 && \
@@ -99,9 +99,21 @@ RUN export TCL_ROOT=tcl8.6.14 && \
     export TK_HASH=8ffdb720f47a6ca6107eac2dd877e30b0ef7fac14f3a84ebbd0b3612cee41a94 && \
     manylinux-entrypoint /build_scripts/build-tcltk.sh
 
-COPY build_scripts/build-cpython.sh /build_scripts/
+FROM build_base AS build_mpdecimal
+COPY build_scripts/build-mpdecimal.sh /build_scripts/
+RUN export MPDECIMAL_ROOT=mpdecimal-4.0.0 && \
+    export MPDECIMAL_HASH=942445c3245b22730fd41a67a7c5c231d11cb1b9936b9c0f76334fb7d0b4468c && \
+    export MPDECIMAL_DOWNLOAD_URL=https://www.bytereef.org/software/mpdecimal/releases && \
+    manylinux-entrypoint /build_scripts/build-mpdecimal.sh
 
 
+FROM build_base AS build_cpython_system_ssl
+COPY --from=build_tcl_tk /manylinux-buildfs /
+COPY --from=build_mpdecimal /manylinux-buildfs /
+COPY --from=build_sqlite3 /manylinux-buildfs /
+COPY build_scripts/build-cpython.sh /build_scripts/
+RUN if command -v apk >/dev/null 2>&1; then ldconfig /; else ldconfig; fi
+
 FROM build_cpython_system_ssl AS build_cpython
 COPY build_scripts/build-openssl.sh /build_scripts/
 RUN export OPENSSL_ROOT=openssl-3.0.15 && \
@@ -118,7 +130,6 @@ FROM build_cpython_system_ssl AS build_cpython37
 COPY build_scripts/cpython-pubkeys.txt /build_scripts/cpython-pubkeys.txt
 RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.7.17
 
-
 FROM build_cpython AS build_cpython38
 COPY build_scripts/ambv-pubkey.txt /build_scripts/cpython-pubkeys.txt
 RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.8.20
@@ -149,8 +160,10 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.0 nogil
 
 
 FROM runtime_base
+COPY --from=build_tcl_tk /manylinux-rootfs /
+COPY --from=build_mpdecimal /manylinux-rootfs /
+COPY --from=build_sqlite3 /manylinux-rootfs /
 COPY --from=build_git /manylinux-rootfs /
-COPY --from=build_cpython_system_ssl /manylinux-rootfs /
 COPY build_scripts /opt/_internal/build_scripts/
 RUN --mount=type=bind,target=/build_cpython36,from=build_cpython36 \
     --mount=type=bind,target=/build_cpython37,from=build_cpython37 \
diff --git a/docker/build_scripts/build-mpdecimal.sh b/docker/build_scripts/build-mpdecimal.sh
new file mode 100755
index 00000000..f4ba9bcb
--- /dev/null
+++ b/docker/build_scripts/build-mpdecimal.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# Top-level build script called from Dockerfile
+
+# Stop at any error, show all commands
+set -exuo pipefail
+
+# Get script directory
+MY_DIR=$(dirname "${BASH_SOURCE[0]}")
+
+# Get build utilities
+source $MY_DIR/build_utils.sh
+
+# Install a more recent mpdecimal
+check_var ${MPDECIMAL_ROOT}
+check_var ${MPDECIMAL_HASH}
+check_var ${MPDECIMAL_DOWNLOAD_URL}
+
+PREFIX=/opt/_internal/${MPDECIMAL_ROOT%%.*}
+
+fetch_source ${MPDECIMAL_ROOT}.tar.gz ${MPDECIMAL_DOWNLOAD_URL}
+check_sha256sum ${MPDECIMAL_ROOT}.tar.gz ${MPDECIMAL_HASH}
+tar xfz ${MPDECIMAL_ROOT}.tar.gz
+pushd ${MPDECIMAL_ROOT}
+# add rpath
+sed -i "s|^Libs:|Libs: -Wl,--enable-new-dtags,-rpath=\${libdir} |g" ./libmpdec/.pc/libmpdec.pc.in
+DESTDIR=/manylinux-rootfs do_standard_install --prefix=${PREFIX} --enable-shared --enable-pc --disable-doc --disable-static --disable-cxx
+popd
+rm -rf ${MPDECIMAL_ROOT} ${MPDECIMAL_ROOT}.tar.gz
+
+# Strip what we can
+strip_ /manylinux-rootfs
+
+# Install for build
+mkdir /manylinux-buildfs
+cp -rlf /manylinux-rootfs/* /manylinux-buildfs/
+# copy pkgconfig
+mkdir -p /manylinux-buildfs/usr/local/lib/pkgconfig/
+ln -s ${PREFIX}/lib/pkgconfig/libmpdec.pc /manylinux-buildfs/usr/local/lib/pkgconfig/libmpdec.pc
+
+# Clean-up for runtime
+rm -rf /manylinux-rootfs/${PREFIX}/lib/pkgconfig /manylinux-rootfs/${PREFIX}/include
diff --git a/docker/build_scripts/build-sqlite3.sh b/docker/build_scripts/build-sqlite3.sh
index 6d2447d4..1879db1e 100755
--- a/docker/build_scripts/build-sqlite3.sh
+++ b/docker/build_scripts/build-sqlite3.sh
@@ -28,13 +28,9 @@ rm /manylinux-rootfs/usr/local/lib/libsqlite3.a
 # Strip what we can
 strip_ /manylinux-rootfs
 
-# Install
-cp -rlf /manylinux-rootfs/* /
-if [ "${BASE_POLICY}" == "musllinux" ]; then
-	ldconfig /
-elif [ "${BASE_POLICY}" == "manylinux" ]; then
-	ldconfig
-fi
+# Install for build
+mkdir /manylinux-buildfs
+cp -rlf /manylinux-rootfs/* /manylinux-buildfs/
 
 # Clean-up for runtime
 rm -rf /manylinux-rootfs/usr/local/share
diff --git a/docker/build_scripts/build-tcltk.sh b/docker/build_scripts/build-tcltk.sh
index ee8c52ab..e19a9fc0 100755
--- a/docker/build_scripts/build-tcltk.sh
+++ b/docker/build_scripts/build-tcltk.sh
@@ -21,6 +21,8 @@ check_var ${TK_HASH}
 if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] ; then
 	yum erase -y tcl tk
 else
+	mkdir -p /manylinux-rootfs
+	mkdir -p /manylinux-buildfs
 	exit 0
 fi
 
@@ -50,13 +52,9 @@ rm /manylinux-rootfs/usr/local/lib/libtkstub8.6.a
 # Strip what we can
 strip_ /manylinux-rootfs
 
-# Install
-cp -rlf /manylinux-rootfs/* /
-if [ "${BASE_POLICY}" == "musllinux" ]; then
-	ldconfig /
-elif [ "${BASE_POLICY}" == "manylinux" ]; then
-	ldconfig
-fi
+# Install for build
+mkdir /manylinux-buildfs
+cp -rlf /manylinux-rootfs/* /manylinux-buildfs/
 
 # Clean-up for runtime
 rm -rf /manylinux-rootfs/usr/local/share