diff --git a/steps/improve/import_payload.sh b/steps/improve/import_payload.sh
index 204027ac..1a8acad4 100644
--- a/steps/improve/import_payload.sh
+++ b/steps/improve/import_payload.sh
@@ -5,14 +5,7 @@
 
 set -ex
 
-if match x${PAYLOAD_REQUIRED} xTrue; then
-    mkdir -p /dev
-    rm -f /dev/sda /dev/sdb /dev/sdc /dev/sdd
-    mknod -m 600 /dev/sda b 8 0
-    mknod -m 600 /dev/sdb b 8 16
-    mknod -m 600 /dev/sdc b 8 32
-    mknod -m 600 /dev/sdd b 8 48
-
+if [ "${PAYLOAD_REQUIRED}" = True ]; then
     mkdir -p /external/distfiles
     payload-import /external/distfiles
 fi
diff --git a/steps/manifest b/steps/manifest
index d6b7b4b0..ee10c6de 100644
--- a/steps/manifest
+++ b/steps/manifest
@@ -42,7 +42,6 @@ build: lwext4-1.0.0-lb1 ( BUILD_FIWIX == True )
 build: kexec-fiwix-1.0 ( BUILD_FIWIX == True )
 build: payload-import-1.0 ( KERNEL_BOOTSTRAP == True )
 jump: fiwix ( KERNEL_BOOTSTRAP == True )
-improve: import_payload ( KERNEL_BOOTSTRAP == True )
 improve: reconfigure ( CONFIGURATOR != True )
 define: JOBS = 1 ( KERNEL_BOOTSTRAP == True )
 build: make-3.82
@@ -58,6 +57,7 @@ improve: setup_repo
 improve: update_env
 improve: merged_usr
 improve: populate_device_nodes
+improve: import_payload ( KERNEL_BOOTSTRAP == True )
 define: CONSOLES = ( INTERACTIVE == True && CHROOT == False )
 improve: open_console ( CONSOLES == True )
 build: tcc-0.9.27