diff --git a/Android.mk b/Android.mk
index c94499b..0d0173c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter berlin,$(TARGET_DEVICE)),)
+ifneq ($(filter berlin dubai,$(TARGET_DEVICE)),)
 subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
 $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))
 
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 5e3ae2e..0c4ccd5 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -51,7 +51,7 @@ BOARD_KERNEL_CMDLINE += service_locator.enable=1 androidboot.usbcontroller=a6000
 BOARD_KERNEL_CMDLINE += swiotlb=0 loop.max_part=7 cgroup.memory=nokmem,nosocket
 BOARD_KERNEL_CMDLINE += pcie_ports=compat loop.max_part=7 iptable_raw.raw_before_defrag=1
 BOARD_KERNEL_CMDLINE += ip6table_raw.raw_before_defrag=1 androidboot.hab.csv=0
-BOARD_KERNEL_CMDLINE += androidboot.hab.product=berlin androidboot.hab.cid=50
+BOARD_KERNEL_CMDLINE += androidboot.hab.cid=50
 BOARD_KERNEL_CMDLINE += firmware_class.path=/vendor/firmware_mnt/image
 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 BOARD_KERNEL_IMAGE_NAME := Image
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 63959f6..5dfd11a 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -38,6 +38,7 @@
 /(mnt/vendor/persist|persist)/fps(/.*)?                 u:object_r:vendor_persist_fps_file:s0
 /(vendor|system/vendor)/bin/fpc_ident                   u:object_r:hal_fingerprint_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.berlin          u:object_r:hal_fingerprint_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.dubai           u:object_r:hal_fingerprint_default_exec:s0
 /data/vendor/.fps(/.*)?                                 u:object_r:fingerprint_vendor_data_file:s0
 /data/vendor/fpc(/.*)?                                  u:object_r:fingerprint_vendor_data_file:s0
 /data/vendor/gf_data(/.*)?                              u:object_r:fingerprint_vendor_data_file:s0
@@ -69,6 +70,7 @@
 
 # Touch
 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.berlin      u:object_r:hal_lineage_touch_default_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.dubai       u:object_r:hal_lineage_touch_default_exec:s0
 
 # Thermal
 /dev/mmi_sys_temp                                       u:object_r:vendor_thermal_device:s0
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 12daf9a..ab838f4 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -25,7 +25,7 @@ source "${HELPER}"
 setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true
 
 # Warning headers and guards
-write_headers "berlin"
+write_headers "berlin dubai"
 
 # The standard common blobs
 write_makefiles "${MY_DIR}/proprietary-files.txt" true