diff --git a/steps-guix/improve/guix-daemon-and-pull.sh b/steps-guix/improve/guix-daemon-and-pull.sh
index 3275bf3f..466e14c8 100644
--- a/steps-guix/improve/guix-daemon-and-pull.sh
+++ b/steps-guix/improve/guix-daemon-and-pull.sh
@@ -36,6 +36,10 @@ mkdir -p /proc /sys /dev "${guix_localstate_dir}/daemon-socket" /var/lib/guix /r
 mount | grep ' on /proc ' >/dev/null 2>&1 || mount -t proc proc /proc
 mount | grep ' on /sys ' >/dev/null 2>&1 || mount -t sysfs sysfs /sys
 mount | grep ' on /dev ' >/dev/null 2>&1 || mount -t devtmpfs devtmpfs /dev
+if ! mount | grep ' on /dev/pts ' >/dev/null 2>&1; then
+    mkdir -p /dev/pts
+    mount -t devpts devpts /dev/pts
+fi
 
 if ! have_group guixbuild; then
     groupadd --system guixbuild
diff --git a/steps/improve/make_bootable.sh b/steps/improve/make_bootable.sh
index 9bfa1037..f8cfba34 100644
--- a/steps/improve/make_bootable.sh
+++ b/steps/improve/make_bootable.sh
@@ -67,7 +67,10 @@ setup_kernel_devices() {
     mount | grep ' on /sys ' &> /dev/null || (mkdir -p /sys; mount -t sysfs sysfs /sys)
     # Make /tmp a ramdisk (speeds up configure etc significantly)
     mount | grep ' on /tmp ' &> /dev/null || (mkdir -p /tmp; mount -t tmpfs tmpfs /tmp)
-    mount | grep ' on /dev/pts ' &> /dev/null || (mkdir -p /dev/pts; mount -t devpts devpts /dev/pts)
+    if ! mount | grep ' on /dev/pts ' &> /dev/null; then
+        mkdir -p /dev/pts
+        mount -t devpts devpts /dev/pts
+    fi
     mount | grep ' on /dev/shm ' &> /dev/null || (mkdir -p /dev/shm; mount -t tmpfs tmpfs /dev/shm)
 
     test -c /dev/console || mknod -m 666 /dev/console c 5 1