diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 5179c53..d85dd54 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -3,21 +3,22 @@
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 #<src>                                              <mnt_point>  <type>  <mnt_flags and options>                                                        <fs_mgr_flags>
 
-/dev/block/bootdevice/by-name/system                /system      ext4    ro,barrier=1                                                                   wait
-/dev/block/bootdevice/by-name/userdata              /data        f2fs    nosuid,nodev,noatime,nodiratime,inline_xattr,data_flush                        wait,check,encryptable=footer,formattable,length=-16384
-/dev/block/bootdevice/by-name/userdata              /data        ext4    nosuid,nodev,noatime,nodiratime,barrier=1,noauto_da_alloc                      wait,check,encryptable=footer,formattable,length=-16384
-/dev/block/bootdevice/by-name/cache                 /cache       f2fs    nosuid,nodev,noatime,nodiratime,inline_xattr,flush_merge,data_flush            wait,check,formattable
-/dev/block/bootdevice/by-name/cache                 /cache       ext4    nosuid,nodev,noatime,nodiratime,barrier=1                                      wait,check,formattable
-/dev/block/bootdevice/by-name/modem                 /firmware    vfat    ro,shortname=lower,dmask=222,fmask=333,context=u:object_r:firmware_file:s0     wait
-/dev/block/bootdevice/by-name/dsp                   /dsp         ext4    nosuid,nodev,barrier=1                                                         wait
-/dev/block/bootdevice/by-name/persist               /persist     ext4    nosuid,nodev,barrier=1                                                         wait
-/dev/block/bootdevice/by-name/config                /frp         emmc    defaults                                                                       defaults
-/dev/block/bootdevice/by-name/misc                  /misc        emmc    defaults                                                                       defaults
-/dev/block/bootdevice/by-name/efs                   /efs         ext4    nosuid,nodev,noauto_da_alloc,journal_async_commit,data=ordered,errors=panic    wait,check
+/dev/block/bootdevice/by-name/system                /system            ext4    ro,barrier=1                                                                   wait
+/dev/block/bootdevice/by-name/userdata              /data              f2fs    nosuid,nodev,noatime,nodiratime,inline_xattr,data_flush                        wait,check,encryptable=footer,formattable,length=-16384
+/dev/block/bootdevice/by-name/userdata              /data              ext4    nosuid,nodev,noatime,nodiratime,barrier=1,noauto_da_alloc                      wait,check,encryptable=footer,formattable,length=-16384
+/dev/block/bootdevice/by-name/cache                 /cache             f2fs    nosuid,nodev,noatime,nodiratime,inline_xattr,flush_merge,data_flush            wait,check,formattable
+/dev/block/bootdevice/by-name/cache                 /cache             ext4    nosuid,nodev,noatime,nodiratime,barrier=1                                      wait,check,formattable
+/dev/block/bootdevice/by-name/apnhlos               /firmware          vfat    ro,shortname=lower,dmask=222,fmask=333,context=u:object_r:firmware_file:s0     wait
+/dev/block/bootdevice/by-name/modem                 /firmware-modem    vfat    ro,shortname=lower,dmask=222,fmask=333,context=u:object_r:firmware_file:s0     wait
+/dev/block/bootdevice/by-name/dsp                   /dsp               ext4    nosuid,nodev,barrier=1                                                         wait
+/dev/block/bootdevice/by-name/persist               /persist           ext4    nosuid,nodev,barrier=1                                                         wait
+/dev/block/bootdevice/by-name/config                /frp               emmc    defaults                                                                       defaults
+/dev/block/bootdevice/by-name/misc                  /misc              emmc    defaults                                                                       defaults
+/dev/block/bootdevice/by-name/efs                   /efs               ext4    nosuid,nodev,noauto_da_alloc,journal_async_commit,data=ordered,errors=panic    wait,check
 
-/dev/block/bootdevice/by-name/boot                  /boot        emmc    defaults                                                                       recoveryonly
-/dev/block/bootdevice/by-name/recovery              /recovery    emmc    defaults                                                                       recoveryonly
+/dev/block/bootdevice/by-name/boot                  /boot              emmc    defaults                                                                       recoveryonly
+/dev/block/bootdevice/by-name/recovery              /recovery          emmc    defaults                                                                       recoveryonly
 
 # SDCard
-/devices/soc.0/7864900.sdhci/mmc_host*              auto         auto    defaults                                                                       voldmanaged=sdcard1:auto,encryptable=userdata
-/devices/platform/msm_hsusb_host/usb*               auto         auto    defaults                                                                       voldmanaged=usb:auto
+/devices/soc.0/7864900.sdhci/mmc_host*              auto               auto    defaults                                                                       voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/platform/msm_hsusb_host/usb*               auto               auto    defaults                                                                       voldmanaged=usb:auto
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index ed6ddbc..a13317e 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -34,6 +34,7 @@ on early-init
     write /sys/class/leds/lcd-backlight/trigger "backlight"
 
     mkdir /firmware 0771 system system
+    mkdir /firmware-modem 0771 system system
     mkdir /system 0777 root root
     symlink /data/tombstones /tombstones
     mkdir /dsp 0771 media media
@@ -79,6 +80,12 @@ on fs
     write /proc/sys/vm/swappiness 100
     mkdir /persist/data 0700 system system
     restorecon_recursive /persist
+    restorecon_recursive /dsp
+    chown system radio /efs
+    chmod 0771 /efs
+    restorecon_recursive /efs
+
+    rm -rf /efs/dmverity
 
 on boot
     chown bluetooth bluetooth /sys/module/bluetooth_power/parameters/power