diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index 64a7a89b86..c2863b7bd1 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -529,7 +529,8 @@ insert_extra_slsa() {
     if [ -f "${binpkg}" ]; then
       info "Found ${atom} at ${binpkg}"
       qtbz2 -O -t "${binpkg}" | \
-        sudo tar -C "${rootfs}" -xj --wildcards './usr/share/SLSA'
+        lbzcat -d -c - | \
+        sudo tar -C "${rootfs}" -x --wildcards './usr/share/SLSA'
       continue
     fi
     warn "Missing SLSA information for ${atom}"
diff --git a/build_library/prod_image_util.sh b/build_library/prod_image_util.sh
index 183d57f9ef..050c31628e 100755
--- a/build_library/prod_image_util.sh
+++ b/build_library/prod_image_util.sh
@@ -44,7 +44,8 @@ extract_prod_gcc() {
     #  /usr/lib/gcc/x86_64-cros-linux-gnu/$version/*
     # Instead we extract them to plain old /usr/lib
     qtbz2 -O -t "${pkg}" | \
-        sudo tar -C "${root_fs_dir}" -xj \
+        lbzcat -d -c - | \
+        sudo tar -C "${root_fs_dir}" -x \
         --transform 's#/usr/lib/.*/#/usr/lib64/#' \
         --wildcards './usr/lib/gcc/*.so*' \
         --wildcards './usr/share/SLSA'
diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 3721c7b15b..8e8010cdf6 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -695,7 +695,7 @@ _write_cpio_common() {
 
     # Build the squashfs, embed squashfs into a gzipped cpio
     pushd "${cpio_target}" >/dev/null
-    sudo mksquashfs "${base_dir}" "./usr.squashfs" -pf "${VM_TMP_DIR}/extra"
+    sudo mksquashfs "${base_dir}" "./usr.squashfs" -pf "${VM_TMP_DIR}/extra" -xattrs-exclude '^btrfs.'
     find . | cpio -o -H newc | gzip > "$2"
     popd >/dev/null
 
diff --git a/ci-automation/test.sh b/ci-automation/test.sh
index bdddb4a3b4..04890e4746 100644
--- a/ci-automation/test.sh
+++ b/ci-automation/test.sh
@@ -167,7 +167,7 @@ function _test_run_impl() {
         #  determine success based on test results (tapfile).
         set +e
         touch sdk_container/.env
-        docker run --rm --name="${container_name}" --privileged --net host -v /dev:/dev \
+        docker run --pull always --rm --name="${container_name}" --privileged --net host -v /dev:/dev \
           -w /work -v "$PWD":/work "${mantle_ref}" \
          bash -c "git config --global --add safe.directory /work && \
                   source sdk_container/.env && \
@@ -176,7 +176,7 @@ function _test_run_impl() {
         rm -f "${work_dir}/first_run"
 
         # Note: git safe.directory is not set in this run as it does not use git
-        docker run --rm --name="${container_name}" --privileged --net host -v /dev:/dev \
+        docker run --pull always --rm --name="${container_name}" --privileged --net host -v /dev:/dev \
           -w /work -v "$PWD":/work "${mantle_ref}" \
             ci-automation/test_update_reruns.sh \
                 "${arch}" "${vernum}" "${image}" "${retry}" \
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-libs/ncurses b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-libs/ncurses
new file mode 100644
index 0000000000..0788550fcd
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-libs/ncurses
@@ -0,0 +1,5 @@
+cros_post_src_install_tmux_terminfo() {
+	mkdir -p "${ED}/usr/share/terminfo/t"
+	cp "${ED}/usr/share/terminfo/"{s/screen,t/tmux}
+	cp "${ED}/usr/share/terminfo/"{s/screen-256color,t/tmux-256color}
+}