diff --git a/beryllium/device.mk b/beryllium/device.mk
index 8c72142..c9af082 100644
--- a/beryllium/device.mk
+++ b/beryllium/device.mk
@@ -14,5 +14,11 @@
 # limitations under the License.
 #
 
+# Build generic Audio HAL
+PRODUCT_PACKAGES := audio.primary.$(TARGET_DEVICE)
+
+# Build generic lights HAL
+PRODUCT_PACKAGES += lights.$(TARGET_DEVICE)
+
 RAMDISK_FSTAB_TARGET := $(LOCAL_PATH)/fstab.ramdisk
-$(call inherit-product, device/generic/sdm845/sdm845/device.mk)
+$(call inherit-product, device/generic/sdm845/sdm845/device.mk)
\ No newline at end of file
diff --git a/enchilada/device.mk b/enchilada/device.mk
index 8c72142..1454d29 100644
--- a/enchilada/device.mk
+++ b/enchilada/device.mk
@@ -14,5 +14,11 @@
 # limitations under the License.
 #
 
+# Build generic Audio HAL
+PRODUCT_PACKAGES := audio.primary.$(TARGET_DEVICE)
+
+# Build generic lights HAL
+PRODUCT_PACKAGES += lights.$(TARGET_DEVICE)
+
 RAMDISK_FSTAB_TARGET := $(LOCAL_PATH)/fstab.ramdisk
 $(call inherit-product, device/generic/sdm845/sdm845/device.mk)
diff --git a/enchilada/fstab.ramdisk b/enchilada/fstab.ramdisk
index 49f8064..e03e076 100644
--- a/enchilada/fstab.ramdisk
+++ b/enchilada/fstab.ramdisk
@@ -1,3 +1,3 @@
-/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/system /system ext4 noatime,ro,errors=panic wait,first_stage_mount,slotselect
+/dev/block/platform/soc@0/1d84000.ufshc/by-name/vendor /vendor ext4 noatime,ro,errors=panic wait,first_stage_mount,slotselect
 /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/sdm845/device.mk b/sdm845/device.mk
index 4c320b3..f80a3db 100644
--- a/sdm845/device.mk
+++ b/sdm845/device.mk
@@ -31,12 +31,6 @@
     device/generic/sdm845/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.sdm845.usb.rc \
     device/generic/sdm845/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/sdm845.kl
 
-# Build generic Audio HAL
-PRODUCT_PACKAGES := audio.primary.sdm845
-
-# Build generic lights HAL
-PRODUCT_PACKAGES += lights.sdm845
-
 PRODUCT_PACKAGES += \
     pd-mapper \
     qrtr-ns \