diff --git a/enchilada.mk b/enchilada.mk
index 2a0ad36..3d49f6b 100644
--- a/enchilada.mk
+++ b/enchilada.mk
@@ -2,11 +2,11 @@
 TARGET_KERNEL_USE := mainline
 endif
 
-KERNEL_MODS := $(wildcard device/oneplus/enchilada/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/*.ko)
+KERNEL_MODS := 
 
 # Following modules go to vendor partition
 # msm.ko is too big (31M) for ramdisk
-VENDOR_KERN_MODS := %/msm.ko
+VENDOR_KERN_MODS := $(wildcard device/oneplus/enchilada/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/*.ko)
 BOARD_VENDOR_KERNEL_MODULES := $(filter $(VENDOR_KERN_MODS),$(KERNEL_MODS))
 
 # All other modules go to ramdisk
diff --git a/enchilada/BoardConfig.mk b/enchilada/BoardConfig.mk
index abb34db..87f9f7b 100644
--- a/enchilada/BoardConfig.mk
+++ b/enchilada/BoardConfig.mk
@@ -10,7 +10,7 @@
 BOARD_KERNEL_PAGESIZE    := 4096
 BOARD_KERNEL_TAGS_OFFSET := 0x00000100
 BOARD_RAMDISK_OFFSET     := 0x01000000
-BOARD_KERNEL_CMDLINE     := console=ttyMSM0,115200n8 androidboot.console=ttyMSM0
+BOARD_KERNEL_CMDLINE     := earlycon earlyprintk console=ttyMSM0,115200n8 androidboot.console=ttyMSM0
 BOARD_KERNEL_CMDLINE     += androidboot.hardware=enchilada androidboot.boot_devices=soc@0/1d84000.ufshc
 BOARD_KERNEL_CMDLINE     += firmware_class.path=/vendor/firmware/ init=/init printk.devkmsg=on
 BOARD_KERNEL_CMDLINE     += deferred_probe_timeout=30
@@ -18,7 +18,7 @@
  
 # Image Configuration
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 #64M
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 57453555712
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2998927360
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 118112366592
 BOARD_VENDORIMAGE_PARTITION_SIZE := 536870912
 BOARD_FLASH_BLOCK_SIZE := 262144
diff --git a/enchilada/fstab.ramdisk b/enchilada/fstab.ramdisk
index 5addab9..49f8064 100644
--- a/enchilada/fstab.ramdisk
+++ b/enchilada/fstab.ramdisk
@@ -1,4 +1,3 @@
-/dev/block/platform/soc@0/1d84000.ufshc/by-name/system /system ext4 noatime,ro,errors=panic wait,first_stage_mount
-/dev/block/platform/soc@0/1d84000.ufshc/by-name/vendor /vendor ext4 noatime,ro,errors=panic wait,first_stage_mount
-/dev/block/platform/soc@0/1d84000.ufshc/by-name/userdata /data		ext4	discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1,inlinecrypt	wait,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,quota
-/devices/platform/soc@0/8804000.sdhci/mmc_host/mmc*	auto	auto	defaults	voldmanaged=sdcard1:auto
+/dev/block/platform/soc@0/1d84000.ufshc/by-name/system_a /system ext4 noatime,ro,errors=panic wait,first_stage_mount
+/dev/block/platform/soc@0/1d84000.ufshc/by-name/vendor_a /vendor ext4 noatime,ro,errors=panic wait,first_stage_mount
+/dev/block/platform/soc@0/1d84000.ufshc/by-name/userdata /data		ext4	discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1	wait,formattable,quota
diff --git a/sepolicy/genfs_contexts b/sepolicy/genfs_contexts
index 90ca07a..1766cc6 100644
--- a/sepolicy/genfs_contexts
+++ b/sepolicy/genfs_contexts
@@ -1,4 +1,5 @@
-genfscon sysfs   /devices/platform/f6301000.memory/rmtfs					u:object_r:sysfs_rmtfs:s0
+genfscon sysfs   /devices/platform/f6301000.memory/rmtfs					u:object_r:sysfs_rmtfs:s0 # Beryllium
+genfscon sysfs   /devices/platform/f5b01000.memory/rmtfs					u:object_r:sysfs_rmtfs:s0 # Enchilada
 genfscon sysfs   /devices/platform/remoteproc-adsp/remoteproc					u:object_r:sysfs_remoteproc:s0
 genfscon sysfs   /devices/platform/remoteproc-cdsp/remoteproc					u:object_r:sysfs_remoteproc:s0
 genfscon sysfs   /devices/platform/soc@0/4080000.remoteproc					u:object_r:sysfs_remoteproc:s0