diff --git a/Artifacts.toml b/Artifacts.toml
index 772f7811..9f853eac 100644
--- a/Artifacts.toml
+++ b/Artifacts.toml
@@ -5190,6 +5190,28 @@ os = "linux"
     sha256 = "f51e2d7defe0979abff04e024f75d75d1ef18da9cc9813dbfd5deb8701b8cf7f"
     url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Rootfs-v2024.3.29/Rootfs.v2024.3.29.x86_64-linux-musl.unpacked.tar.gz"
 
+[["Rootfs.v2025.4.29.x86_64-linux-musl.squashfs"]]
+arch = "x86_64"
+git-tree-sha1 = "5526badb5a049bc45844cae977818e2c3316adb7"
+lazy = true
+libc = "musl"
+os = "linux"
+
+    [["Rootfs.v2025.4.29.x86_64-linux-musl.squashfs".download]]
+    sha256 = "fd17c40c6833111743bb2fde602596cb6bad1f22c5ec765d017c67fc9afe1e9d"
+    url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Rootfs-v2025.4.29/Rootfs.v2025.4.29.x86_64-linux-musl.squashfs.tar.gz"
+
+[["Rootfs.v2025.4.29.x86_64-linux-musl.unpacked"]]
+arch = "x86_64"
+git-tree-sha1 = "9e748d08d77b69cc7838da98974697ab494e63d7"
+lazy = true
+libc = "musl"
+os = "linux"
+
+    [["Rootfs.v2025.4.29.x86_64-linux-musl.unpacked".download]]
+    sha256 = "6891d3590153dbc8ad1e9c401f5f9d91e44d179747b6df38ef1ac31375fb1852"
+    url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Rootfs-v2025.4.29/Rootfs.v2025.4.29.x86_64-linux-musl.unpacked.tar.gz"
+
 [["RustBase.v1.57.0.x86_64-linux-musl.squashfs"]]
 arch = "x86_64"
 git-tree-sha1 = "ced9ffc9b69fbf10db7f413aacfd4d6099825cf2"
diff --git a/src/Runner.jl b/src/Runner.jl
index cf4f3c5d..4544892d 100644
--- a/src/Runner.jl
+++ b/src/Runner.jl
@@ -75,7 +75,7 @@ function ld_library_path(target::AbstractPlatform,
     # that can natively run within this environment
     if csl_paths
         append!(paths,
-                unique("/usr/lib/csl-$(libc(p))-$(arch(p))" for p in (host, target) if Sys.islinux(p) && proc_family(p) == "intel"),
+                unique("/usr/lib/csl-$(libc(p))-$(arch(p))" for p in (target, host) if Sys.islinux(p) && proc_family(p) == "intel"),
                 )
     end
 
@@ -1489,7 +1489,9 @@ function runner_setup!(workspaces, mappings, workspace_root, verbose, kwargs, pl
         if !isdir(ccache_dir())
             mkpath(ccache_dir())
         end
-        push!(workspaces, ccache_dir() => envs["CCACHE_DIR"])
+        # During bootstrap `CCACHE_DIR` may not be defined, we provide a
+        # fallback for that case, otherwise rely on the environment variable.
+        push!(workspaces, ccache_dir() => get(envs, "CCACHE_DIR", "/root/.ccache"))
     end
 
     return platform, envs, shards
diff --git a/test/runners.jl b/test/runners.jl
index 3d330b86..a8b9f515 100644
--- a/test/runners.jl
+++ b/test/runners.jl
@@ -322,15 +322,10 @@ end
                 ./test
                 """
                 cmd = `/bin/bash -c "$(test_script)"`
-                if arch(platform) == "i686" && libc(platform) == "musl"
-                    # We can't run this program for this platform
-                    @test_broken run(ur, cmd, iobuff; tee_stream=devnull)
-                else
-                    @test run(ur, cmd, iobuff; tee_stream=devnull)
-                    seekstart(iobuff)
-                    # Test that we get the output we expect
-                    @test endswith(readchomp(iobuff), "Hello World!")
-                end
+                @test run(ur, cmd, iobuff; tee_stream=devnull)
+                seekstart(iobuff)
+                # Test that we get the output we expect
+                @test endswith(readchomp(iobuff), "Hello World!")
                 cleanup_dependencies(prefix, artifact_paths, concrete_platform)
             end
         end
@@ -377,15 +372,10 @@ end
                 ./test
                 """
                 cmd = `/bin/bash -c "$(test_script)"`
-                if arch(platform) == "i686" && libc(platform) == "musl"
-                    # We can't run C++ programs for this platform
-                    @test_broken run(ur, cmd, iobuff; tee_stream=devnull)
-                else
-                    @test run(ur, cmd, iobuff; tee_stream=devnull)
-                    seekstart(iobuff)
-                    # Test that we get the output we expect
-                    @test endswith(readchomp(iobuff), "Hello World!")
-                end
+                @test run(ur, cmd, iobuff; tee_stream=stdout)
+                seekstart(iobuff)
+                # Test that we get the output we expect
+                @test endswith(readchomp(iobuff), "Hello World!")
                 cleanup_dependencies(prefix, artifact_paths, concrete_platform)
             end
         end