diff --git a/rootdir/etc/fstab.m4 b/rootdir/etc/fstab.m4
index d83a00a..5bb45c9 100644
--- a/rootdir/etc/fstab.m4
+++ b/rootdir/etc/fstab.m4
@@ -8,12 +8,12 @@
/dev/block/mmcblk0p17 /firmware_q6 vfat ro,shortname=lower wait
#/dev/block/mmcblk0p18 /firmware_wcnss vfat ro,shortname=lower wait
-/dev/block/mmcblk0p31 /boot emmc defaults defaults
-/dev/block/mmcblk0p32 /recovery emmc defaults defaults
-/dev/block/mmcblk0p24 /devlog ext4 noatime,nosuid,nodev,noauto_da_alloc,barrier=0 wait
-/dev/block/mmcblk0p33 /system ext4 rw,noatime,barrier=0 wait
-/dev/block/mmcblk0p34 /cache ext4 nosuid,nodev,noatime,barrier=0 wait,check
-/dev/block/mmcblk0p35 /data ext4 noatime,nosuid,nodev,noauto_da_alloc,barrier=0,discard wait,check,encryptable=/dev/block/mmcblk0p29
+/dev/block/mmcblk0p33 /boot emmc defaults defaults
+/dev/block/mmcblk0p34 /recovery emmc defaults defaults
+/dev/block/mmcblk0p25 /devlog ext4 noatime,nosuid,nodev,noauto_da_alloc,barrier=0 wait
+/dev/block/mmcblk0p35 /system ext4 rw,noatime,barrier=0 wait
+/dev/block/mmcblk0p36 /cache ext4 nosuid,nodev,noatime,barrier=0 wait,check
+/dev/block/mmcblk0p37 /data ext4 noatime,nosuid,nodev,noauto_da_alloc,barrier=0,discard wait,check,encryptable=/dev/block/mmcblk0p30
# USB Storage
/devices/platform/msm_hsusb_host/usb auto auto defaults voldmanaged=usbdisk:auto
diff --git a/rootdir/etc/remount.m4 b/rootdir/etc/remount.m4
index c5960dd..8789c5e 100644
--- a/rootdir/etc/remount.m4
+++ b/rootdir/etc/remount.m4
@@ -3,4 +3,4 @@
# The filesystem that contains the filesystem checker binary (typically /system) cannot
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-/dev/block/mmcblk0p33 /system ext4 remount,ro,noatime,barrier=0 wait
+/dev/block/mmcblk0p35 /system ext4 remount,ro,noatime,barrier=0 wait