diff --git a/rootfs.py b/rootfs.py
index 2e612236..ce96a427 100755
--- a/rootfs.py
+++ b/rootfs.py
@@ -200,6 +200,23 @@ regen_block = (
     + 'if [ -x /script-generator ] && [ -f /steps-guix/manifest ]; then\\n'
     + '/script-generator /steps-guix/manifest /steps\\n'
     + 'fi\\n'
+    + 'if [ -f /steps-guix/0.sh ] && grep -Eq "/steps-guix/[1-9][0-9]*\\\\.sh" "$0"; then\\n'
+    + 'if ! bash /steps-guix/0.sh; then\\n'
+    + 'status=$?\\n'
+    + 'echo "bootstrap script failed with status ${status}; dropping to rescue shell" >&2\\n'
+    + 'PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PREFIX}/bin:${PATH}\\n'
+    + 'while true; do\\n'
+    + 'if command -v bash >/dev/null 2>&1; then\\n'
+    + 'env PS1="[FAIL ${status}] \\\\w # " bash -i\\n'
+    + 'elif command -v sh >/dev/null 2>&1; then\\n'
+    + 'env PS1="[FAIL ${status}] \\\\w # " sh -i\\n'
+    + 'else\\n'
+    + 'sleep 60\\n'
+    + 'fi\\n'
+    + 'done\\n'
+    + 'fi\\n'
+    + 'exit 0\\n'
+    + 'fi\\n'
 )
 gated_network_block = (
     'if [ -f /steps/env ]; then\\n'
diff --git a/steps-guix/binutils-2.41/pass1.sh b/steps-guix/binutils-2.41-guix/pass1.sh
similarity index 100%
rename from steps-guix/binutils-2.41/pass1.sh
rename to steps-guix/binutils-2.41-guix/pass1.sh
diff --git a/steps-guix/binutils-2.41/patches/new-gettext.patch b/steps-guix/binutils-2.41-guix/patches/new-gettext.patch
similarity index 100%
rename from steps-guix/binutils-2.41/patches/new-gettext.patch
rename to steps-guix/binutils-2.41-guix/patches/new-gettext.patch
diff --git a/steps-guix/binutils-2.41/patches/no-maint-functions-texi.patch b/steps-guix/binutils-2.41-guix/patches/no-maint-functions-texi.patch
similarity index 100%
rename from steps-guix/binutils-2.41/patches/no-maint-functions-texi.patch
rename to steps-guix/binutils-2.41-guix/patches/no-maint-functions-texi.patch
diff --git a/steps-guix/binutils-2.41/patches/no-maint-opcodes.patch b/steps-guix/binutils-2.41-guix/patches/no-maint-opcodes.patch
similarity index 100%
rename from steps-guix/binutils-2.41/patches/no-maint-opcodes.patch
rename to steps-guix/binutils-2.41-guix/patches/no-maint-opcodes.patch
diff --git a/steps-guix/binutils-2.41/sources b/steps-guix/binutils-2.41-guix/sources
similarity index 100%
rename from steps-guix/binutils-2.41/sources
rename to steps-guix/binutils-2.41-guix/sources
diff --git a/steps-guix/gc-8.2.12/pass1.sh b/steps-guix/gc-8.2.12-guix/pass1.sh
similarity index 100%
rename from steps-guix/gc-8.2.12/pass1.sh
rename to steps-guix/gc-8.2.12-guix/pass1.sh
diff --git a/steps-guix/gc-8.2.12/sources b/steps-guix/gc-8.2.12-guix/sources
similarity index 100%
rename from steps-guix/gc-8.2.12/sources
rename to steps-guix/gc-8.2.12-guix/sources
diff --git a/steps-guix/gcc-15.2.0/files/decDPD.h.preamble b/steps-guix/gcc-15.2.0-guix/files/decDPD.h.preamble
similarity index 100%
rename from steps-guix/gcc-15.2.0/files/decDPD.h.preamble
rename to steps-guix/gcc-15.2.0-guix/files/decDPD.h.preamble
diff --git a/steps-guix/gcc-15.2.0/files/decDPD_generate.c b/steps-guix/gcc-15.2.0-guix/files/decDPD_generate.c
similarity index 100%
rename from steps-guix/gcc-15.2.0/files/decDPD_generate.c
rename to steps-guix/gcc-15.2.0-guix/files/decDPD_generate.c
diff --git a/steps-guix/gcc-15.2.0/pass1.sh b/steps-guix/gcc-15.2.0-guix/pass1.sh
similarity index 100%
rename from steps-guix/gcc-15.2.0/pass1.sh
rename to steps-guix/gcc-15.2.0-guix/pass1.sh
diff --git a/steps-guix/gcc-15.2.0/sources b/steps-guix/gcc-15.2.0-guix/sources
similarity index 100%
rename from steps-guix/gcc-15.2.0/sources
rename to steps-guix/gcc-15.2.0-guix/sources
diff --git a/steps-guix/libffi-3.5.2/pass1.sh b/steps-guix/libffi-3.5.2-guix/pass1.sh
similarity index 100%
rename from steps-guix/libffi-3.5.2/pass1.sh
rename to steps-guix/libffi-3.5.2-guix/pass1.sh
diff --git a/steps-guix/libffi-3.5.2/sources b/steps-guix/libffi-3.5.2-guix/sources
similarity index 100%
rename from steps-guix/libffi-3.5.2/sources
rename to steps-guix/libffi-3.5.2-guix/sources
diff --git a/steps-guix/libunistring-1.4.1/files/gen-uninames.py b/steps-guix/libunistring-1.4.1-guix/files/gen-uninames.py
similarity index 100%
rename from steps-guix/libunistring-1.4.1/files/gen-uninames.py
rename to steps-guix/libunistring-1.4.1-guix/files/gen-uninames.py
diff --git a/steps-guix/libunistring-1.4.1/pass1.sh b/steps-guix/libunistring-1.4.1-guix/pass1.sh
similarity index 100%
rename from steps-guix/libunistring-1.4.1/pass1.sh
rename to steps-guix/libunistring-1.4.1-guix/pass1.sh
diff --git a/steps-guix/libunistring-1.4.1/patches/reproducible-texi2html.patch b/steps-guix/libunistring-1.4.1-guix/patches/reproducible-texi2html.patch
similarity index 100%
rename from steps-guix/libunistring-1.4.1/patches/reproducible-texi2html.patch
rename to steps-guix/libunistring-1.4.1-guix/patches/reproducible-texi2html.patch
diff --git a/steps-guix/libunistring-1.4.1/sources b/steps-guix/libunistring-1.4.1-guix/sources
similarity index 100%
rename from steps-guix/libunistring-1.4.1/sources
rename to steps-guix/libunistring-1.4.1-guix/sources
diff --git a/steps-guix/manifest b/steps-guix/manifest
index 820e02ad..8088b7b4 100644
--- a/steps-guix/manifest
+++ b/steps-guix/manifest
@@ -4,8 +4,8 @@
 
 # We need a 64-bit kernel to enable Guix to run 64-bit programs.
 # Build 64-bit kernel
-build: binutils-2.41
-build: gcc-15.2.0
+build: binutils-2.41-guix
+build: gcc-15.2.0-guix
 build: argp-standalone-1.4.1
 build: musl-fts-1.2.7
 build: musl-obstack-1.2.3
@@ -28,7 +28,7 @@ build: gnutls-3.8.12
 build: guile-gnutls-v5.0.1
 build: unzip-6.0
 build: sqlite-3510200
-build: zlib-1.3.1
+build: zlib-1.3.1-guix
 build: guile-sqlite3-0.1.3
 build: guile-zlib-0.2.2
 build: guile-lzlib-0.0.2
@@ -57,9 +57,9 @@ build: patch-2.7.6
 build: bash-5.3-1
 build: static-binaries-0-i686-linux
 # Build guile-static-stripped-2.2.4-i686-linux.tar.xz
-build: libunistring-1.4.1
-build: gc-8.2.12
-build: libffi-3.5.2
+build: libunistring-1.4.1-guix
+build: gc-8.2.12-guix
+build: libffi-3.5.2-guix
 build: guile-2.2.4
 # Build mes-minimal-stripped-0.19-i686-linux.tar.xz
 build: mes-minimal-stripped-0.19-i686-linux
diff --git a/steps-guix/zlib-1.3.1/pass1.sh b/steps-guix/zlib-1.3.1-guix/pass1.sh
similarity index 100%
rename from steps-guix/zlib-1.3.1/pass1.sh
rename to steps-guix/zlib-1.3.1-guix/pass1.sh
diff --git a/steps-guix/zlib-1.3.1/sources b/steps-guix/zlib-1.3.1-guix/sources
similarity index 100%
rename from steps-guix/zlib-1.3.1/sources
rename to steps-guix/zlib-1.3.1-guix/sources