diff --git a/board/nanopineo2/boot-fwupdater.scr b/board/nanopineo2/boot-fwupdater.scr
index 304451640f..dca02ddd04 100644
Binary files a/board/nanopineo2/boot-fwupdater.scr and b/board/nanopineo2/boot-fwupdater.scr differ
diff --git a/board/nanopineo2/overlay-initramfs/remove_initramfs b/board/nanopineo2/overlay-initramfs/remove_initramfs
new file mode 100755
index 0000000000..646372bb44
--- /dev/null
+++ b/board/nanopineo2/overlay-initramfs/remove_initramfs
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -f /boot/boot-normal.scr ]; then
+    mv /boot/boot.scr /boot/boot-fwupdater.scr
+    mv /boot/boot-normal.scr /boot/boot.scr
+fi
diff --git a/board/nanopineo2/overlay/usr/libexec/fw-prepare-boot b/board/nanopineo2/overlay/usr/libexec/fw-prepare-boot
index aa419ef61c..86f340ad02 100755
--- a/board/nanopineo2/overlay/usr/libexec/fw-prepare-boot
+++ b/board/nanopineo2/overlay/usr/libexec/fw-prepare-boot
@@ -1,4 +1,7 @@
 #!/bin/bash
 
-sed -r -i 's/#initrd_filename=.*/initrd_filename=fwupdater.img/' /boot/uEnv.txt
+if [ -f /boot/boot-fwupdater.scr ]; then
+    mv /boot/boot.scr /boot/boot-normal.scr
+    mv /boot/boot-fwupdater.scr /boot/boot.scr
+fi
 
diff --git a/board/nanopineo2/postscript.sh b/board/nanopineo2/postscript.sh
index 70522ee003..aaed80a710 100755
--- a/board/nanopineo2/postscript.sh
+++ b/board/nanopineo2/postscript.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 cp $IMG_DIR/Image $BOOT_DIR
-cp $IMG_DIR/boot.scr $BOOT_DIR
+cp $BOARD_DIR/boot.scr $BOOT_DIR
+cp $BOARD_DIR/boot-fwupdater.scr $BOOT_DIR
 cp $BOARD_DIR/sun50i-h5-nanopi-neo2.dtb $BOOT_DIR
-#cp $BOARD_DIR/fwupdater.img $BOOT_DIR
+cp $BOARD_DIR/rootfs.cpio.uboot $BOOT_DIR
 
diff --git a/board/nanopineo2/rootfs.cpio.uboot b/board/nanopineo2/rootfs.cpio.uboot
new file mode 100644
index 0000000000..32bf6d9ec9
Binary files /dev/null and b/board/nanopineo2/rootfs.cpio.uboot differ
diff --git a/configs/nanopineo2_initramfs_defconfig b/configs/nanopineo2_initramfs_defconfig
new file mode 100644
index 0000000000..212f8a25b7
--- /dev/null
+++ b/configs/nanopineo2_initramfs_defconfig
@@ -0,0 +1,16 @@
+BR2_aarch64=y
+BR2_ARM_FPU_VFPV4=y
+BR2_ARM_FPU_NEON_VFPV4=y
+BR2_DL_DIR="$(TOPDIR)/dl"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-nanopineo2-initramfs"
+BR2_OPTIMIZE_2=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TARGET_OPTIMIZATION="-pipe"
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs"
+BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/nanopineo2/overlay-initramfs"
+BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
+# BR2_TARGET_ROOTFS_TAR is not set