diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 58c7b72..a555025 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -240,26 +240,28 @@ extends:
                   arch: alpine-arm64
                   release: ${{ parameters.dockerhub_release }}
 
-          - job: snapcraft_x64
-            pool:
-              name: 1es-ubuntu-22.04-x64
-              os: linux
-            steps:
-              - template: build-containers.yml@self
-                parameters:
-                  arch: snapcraft-x64
-                  release: ${{ parameters.dockerhub_release }}
-
-          - job: snapcraft_arm64
-            pool:
-              name: 1es-ubuntu-22.04-x64
-              os: linux
-            steps:
-              - template: build-containers.yml@self
-                parameters:
-                  qemu: 'true'
-                  arch: snapcraft-arm64
-                  release: ${{ parameters.dockerhub_release }}
+          # Snapcraft images are only built when explicitly publishing container updates.
+          - ${{ if eq(parameters.dockerhub_release, true) }}:
+            - job: snapcraft_x64
+              pool:
+                name: 1es-ubuntu-22.04-x64
+                os: linux
+              steps:
+                - template: build-containers.yml@self
+                  parameters:
+                    arch: snapcraft-x64
+                    release: true
+
+            - job: snapcraft_arm64
+              pool:
+                name: 1es-ubuntu-22.04-x64
+                os: linux
+              steps:
+                - template: build-containers.yml@self
+                  parameters:
+                    qemu: 'true'
+                    arch: snapcraft-arm64
+                    release: true
 
       - stage: Sanity_test_containers
         dependsOn:
@@ -313,38 +315,38 @@ extends:
                   qemu: 'true'
                   release: ${{ parameters.dockerhub_release }}
 
-          # Debian 11: amd64, arm, arm64
-          - job: debian_11_amd64
+          # Debian 13: amd64, arm, arm64
+          - job: debian_13_amd64
             pool:
               name: 1es-ubuntu-22.04-x64
               os: linux
             steps:
               - template: build-sanity-test-containers.yml@self
                 parameters:
-                  name: debian-11
+                  name: debian-13
                   arch: amd64
                   release: ${{ parameters.dockerhub_release }}
 
-          - job: debian_11_arm
+          - job: debian_13_arm
             pool:
               name: 1es-ubuntu-22.04-x64
               os: linux
             steps:
               - template: build-sanity-test-containers.yml@self
                 parameters:
-                  name: debian-11
+                  name: debian-13
                   arch: arm
                   qemu: 'true'
                   release: ${{ parameters.dockerhub_release }}
 
-          - job: debian_11_arm64
+          - job: debian_13_arm64
             pool:
               name: 1es-ubuntu-22.04-x64
               os: linux
             steps:
               - template: build-sanity-test-containers.yml@self
                 parameters:
-                  name: debian-11
+                  name: debian-13
                   arch: arm64
                   qemu: 'true'
                   release: ${{ parameters.dockerhub_release }}
diff --git a/build-musl-toolchain.yml b/build-musl-toolchain.yml
index 93cfdda..74121f2 100644
--- a/build-musl-toolchain.yml
+++ b/build-musl-toolchain.yml
@@ -10,13 +10,15 @@ steps:
     sudo apt-get update
     sudo apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \
     python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
-    patch rsync meson ninja-build git
+    patch rsync meson ninja-build git curl
   displayName: 'Prepare dependencies'
 - script: |
     set -e
     git clone https://github.com/richfelker/musl-cross-make/
     cd musl-cross-make
-    make TARGET=${{ parameters.tuple }} GCC_VER=10.3.0 BINUTILS_VER=2.33.1 LINUX_VER=5.8.5 install
+    make TARGET=${{ parameters.tuple }} GCC_VER=10.3.0 BINUTILS_VER=2.33.1 LINUX_VER=5.8.5 \
+      GNU_SITE=https://ftp.gnu.org/gnu \
+      DL_CMD='curl --fail --location --retry 10 --retry-delay 5 --retry-all-errors --output' install
   displayName: 'Build toolchain'
 - script: |
     set -e
diff --git a/sanity-tests/debian-11/Dockerfile b/sanity-tests/debian-13/Dockerfile
similarity index 96%
rename from sanity-tests/debian-11/Dockerfile
rename to sanity-tests/debian-13/Dockerfile
index faa7429..77a9646 100644
--- a/sanity-tests/debian-11/Dockerfile
+++ b/sanity-tests/debian-13/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=debian:11
+ARG BASE_IMAGE=debian:13
 FROM ${BASE_IMAGE}
 
 # Utilities
diff --git a/sysroot-scripts/generated_package_lists/bullseye.amd64 b/sysroot-scripts/generated_package_lists/bullseye.amd64
index e9d3706..6f7669d 100644
--- a/sysroot-scripts/generated_package_lists/bullseye.amd64
+++ b/sysroot-scripts/generated_package_lists/bullseye.amd64
@@ -1,5 +1,7 @@
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/e/e2fsprogs/comerr-dev_2.1-1.46.6-1~bpo11+1_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/e/e2fsprogs/libcom-err2_1.46.6-1~bpo11+1_amd64.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/g/glib2.0/libglib2.0-0_2.66.8-1_amd64.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/g/glib2.0/libglib2.0-dev_2.66.8-1_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/keyutils/libkeyutils1_1.6.1-2_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/krb5-multidev_1.18.3-6+deb11u3_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/libgssapi-krb5-2_1.18.3-6+deb11u3_amd64.deb
@@ -12,6 +14,7 @@ https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/lib
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/libkrb5-dev_1.18.3-6+deb11u3_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/libkrb5support0_1.18.3-6+deb11u3_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libb/libbsd/libbsd0_0.11.3-1_amd64.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libf/libffi/libffi7_3.3-6_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libm/libmd/libmd0_1.0.3-3_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libselinux/libselinux1_3.1-3_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libt/libtirpc/libtirpc3_1.3.1-1+deb11u1_amd64.deb
@@ -29,6 +32,9 @@ https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libz/libzs
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/o/openssl/libssl1.1_1.1.1n-0+deb11u4_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/o/openssl/libssl-dev_1.1.1n-0+deb11u4_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-8-0_10.36-2+deb11u1_amd64.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre3_8.39-13_amd64.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libblkid1_2.36.1-8+deb11u1_amd64.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libmount1_2.36.1-8+deb11u1_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/x/xorgproto/x11proto-dev_2020.1-1_all.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/x/xz-utils/liblzma5_5.2.5-2.1~deb11u1_amd64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/z/zlib/zlib1g_1.2.11.dfsg-2+deb11u2_amd64.deb
diff --git a/sysroot-scripts/generated_package_lists/bullseye.arm64 b/sysroot-scripts/generated_package_lists/bullseye.arm64
index 945fc32..f965d25 100644
--- a/sysroot-scripts/generated_package_lists/bullseye.arm64
+++ b/sysroot-scripts/generated_package_lists/bullseye.arm64
@@ -1,5 +1,7 @@
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/e/e2fsprogs/comerr-dev_2.1-1.46.6-1~bpo11+1_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/e/e2fsprogs/libcom-err2_1.46.6-1~bpo11+1_arm64.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/g/glib2.0/libglib2.0-0_2.66.8-1_arm64.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/g/glib2.0/libglib2.0-dev_2.66.8-1_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/keyutils/libkeyutils1_1.6.1-2_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/krb5-multidev_1.18.3-6+deb11u3_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/libgssapi-krb5-2_1.18.3-6+deb11u3_arm64.deb
@@ -12,6 +14,7 @@ https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/lib
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/libkrb5-dev_1.18.3-6+deb11u3_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/libkrb5support0_1.18.3-6+deb11u3_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libb/libbsd/libbsd0_0.11.3-1_arm64.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libf/libffi/libffi7_3.3-6_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libm/libmd/libmd0_1.0.3-3_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libselinux/libselinux1_3.1-3_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libt/libtirpc/libtirpc3_1.3.1-1+deb11u1_arm64.deb
@@ -29,6 +32,9 @@ https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libz/libzs
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/o/openssl/libssl1.1_1.1.1n-0+deb11u4_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/o/openssl/libssl-dev_1.1.1n-0+deb11u4_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-8-0_10.36-2+deb11u1_arm64.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre3_8.39-13_arm64.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libblkid1_2.36.1-8+deb11u1_arm64.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libmount1_2.36.1-8+deb11u1_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/x/xorgproto/x11proto-dev_2020.1-1_all.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/x/xz-utils/liblzma5_5.2.5-2.1~deb11u1_arm64.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/z/zlib/zlib1g_1.2.11.dfsg-2+deb11u2_arm64.deb
diff --git a/sysroot-scripts/generated_package_lists/bullseye.armhf b/sysroot-scripts/generated_package_lists/bullseye.armhf
index 182180a..6d69b63 100644
--- a/sysroot-scripts/generated_package_lists/bullseye.armhf
+++ b/sysroot-scripts/generated_package_lists/bullseye.armhf
@@ -1,5 +1,7 @@
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/e/e2fsprogs/comerr-dev_2.1-1.46.6-1~bpo11+1_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/e/e2fsprogs/libcom-err2_1.46.6-1~bpo11+1_armhf.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/g/glib2.0/libglib2.0-0_2.66.8-1_armhf.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/g/glib2.0/libglib2.0-dev_2.66.8-1_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/keyutils/libkeyutils1_1.6.1-2_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/krb5-multidev_1.18.3-6+deb11u3_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/libgssapi-krb5-2_1.18.3-6+deb11u3_armhf.deb
@@ -12,6 +14,7 @@ https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/lib
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/libkrb5-dev_1.18.3-6+deb11u3_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/k/krb5/libkrb5support0_1.18.3-6+deb11u3_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libb/libbsd/libbsd0_0.11.3-1_armhf.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libf/libffi/libffi7_3.3-6_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libm/libmd/libmd0_1.0.3-3_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libs/libselinux/libselinux1_3.1-3_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libt/libtirpc/libtirpc3_1.3.1-1+deb11u1_armhf.deb
@@ -29,6 +32,9 @@ https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/libz/libzs
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/o/openssl/libssl1.1_1.1.1n-0+deb11u4_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/o/openssl/libssl-dev_1.1.1n-0+deb11u4_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre2/libpcre2-8-0_10.36-2+deb11u1_armhf.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/p/pcre3/libpcre3_8.39-13_armhf.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libblkid1_2.36.1-8+deb11u1_armhf.deb
+https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/u/util-linux/libmount1_2.36.1-8+deb11u1_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/x/xorgproto/x11proto-dev_2020.1-1_all.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/x/xz-utils/liblzma5_5.2.5-2.1~deb11u1_armhf.deb
 https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/z/zlib/zlib1g_1.2.11.dfsg-2+deb11u2_armhf.deb
diff --git a/sysroot-scripts/sysroot-creator.sh b/sysroot-scripts/sysroot-creator.sh
index a6ea82b..b6c1a76 100755
--- a/sysroot-scripts/sysroot-creator.sh
+++ b/sysroot-scripts/sysroot-creator.sh
@@ -50,8 +50,12 @@ KEYRING_FILE="${SCRIPT_DIR}/keyring.gpg"
 DEBIAN_PACKAGES="\
   comerr-dev
   krb5-multidev
+  libblkid1
   libbsd0
   libcom-err2
+  libffi7
+  libglib2.0-0
+  libglib2.0-dev
   libgssapi-krb5-2
   libgssrpc4
   libk5crypto3
@@ -64,6 +68,8 @@ DEBIAN_PACKAGES="\
   libkrb5support0
   liblzma5
   libmd0
+  libmount1
+  libpcre3
   libpcre2-8-0
   libselinux1
   libssl-dev