diff --git a/tulip-chiphd/fstab.sun50iw1p1 b/tulip-chiphd/fstab.sun50iw1p1
index cc7acff..be49b38 100755
--- a/tulip-chiphd/fstab.sun50iw1p1
+++ b/tulip-chiphd/fstab.sun50iw1p1
@@ -1,5 +1,7 @@
-/dev/block/mmcblk0p2        /cache      ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic   wait,check
-/dev/block/mmcblk0p3        /data       ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic   wait,check
+/dev/block/mmcblk0p1        /bootloader vfat    rw,umask=0077       wait
+/dev/block/mmcblk0p2        /system     ext4    ro,barrier=1        wait
+/dev/block/mmcblk0p3        /cache      ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic   wait,check
+/dev/block/mmcblk0p4        /data       ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic   wait,check
 
 /devices/soc.0/1c10000.sdmmc/mmc_host/mmc*   auto           auto    defaults                                                                voldmanaged=sdcard1:auto
 /devices/soc.0/1c1a000.ehci0-controller/usb* auto           auto    defaults                                                                voldmanaged=usb:auto
diff --git a/tulip-chiphd/init.sun50iw1p1.rc b/tulip-chiphd/init.sun50iw1p1.rc
index 4336ddd..0716037 100755
--- a/tulip-chiphd/init.sun50iw1p1.rc
+++ b/tulip-chiphd/init.sun50iw1p1.rc
@@ -22,11 +22,6 @@ on early-fs
 
     exec u:r:su:s0 root -- /sbin/busybox sh /initialize_disk.sh
 
-    # mount boot and system
-    # it has to be here as mount_all does not support loopback
-    mount vfat /dev/block/mmcblk0p1 /bootloader rw wait
-    mount ext4 loop@/bootloader/system.img /system rw wait barrier=1
-
     mount_all /fstab.sun50iw1p1
     swapon_all /fstab.sun50iw1p1
     restorecon_recursive /persist
diff --git a/tulip-chiphd/recovery.fstab b/tulip-chiphd/recovery.fstab
index 163bffb..488ccc0 100755
--- a/tulip-chiphd/recovery.fstab
+++ b/tulip-chiphd/recovery.fstab
@@ -4,13 +4,14 @@
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 
 /dev/block/mmcblk0p1        /bootloader vfat    defaults  defaults
-loop@/bootloader/system.img /system     ext4    defaults defaults
-/dev/block/mmcblk0p2        /cache      ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic   wait,check
-/dev/block/mmcblk0p3        /data       ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic   wait,check
+/dev/block/mmcblk0p2        /system     ext4    defaults defaults
+/dev/block/mmcblk0p3        /cache      ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic   wait,check
+/dev/block/mmcblk0p4        /data       ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic   wait,check
 
-/dev/block/mmcblk0p1        /sdcard       vfat    defaults  defaults
+/bootloader/boot.img        /boot       emmc    defaults    defaults
+/bootloader/recovery.img    /recovery   emmc    defaults    defaults
 
-/dev/block/mmcblk1p1        /extsd          vfat    defaults                                                        defaults
-/dev/block/mmcblk1          /extsd          vfat    defaults                                                        defaults
-/dev/block/sda1             /usbhost        vfat    defaults                                                        defaults
-/dev/block/sda              /usbhost        vfat    defaults                                                        defaults
+/dev/block/mmcblk1p1        /sdcard     vfat    defaults                                                        defaults
+/dev/block/mmcblk1          /sdcard     vfat    defaults                                                        defaults
+/dev/block/sda1             /sdcard     vfat    defaults                                                        defaults
+/dev/block/sda              /sdcard     vfat    defaults                                                        defaults