diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6291a00..6898c82 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -41,7 +41,7 @@ TARGET_USES_HWC2 := true
 ifneq ($(TARGET_USE_MESA),false)
 BOARD_MESA3D_USES_MESON_BUILD := true
 BOARD_MESA3D_BUILD_LIBGBM := true
-BOARD_MESA3D_GALLIUM_DRIVERS := kmsro r300 r600 nouveau freedreno swrast v3d vc4 etnaviv tegra svga virgl panfrost lima radeonsi
+BOARD_MESA3D_GALLIUM_DRIVERS := kmsro r300 r600 nouveau freedreno swrast v3d vc4 etnaviv tegra svga virgl panfrost lima radeonsi zink
 BOARD_MESA3D_VULKAN_DRIVERS := broadcom freedreno panfrost swrast virtio amd
 endif
 
@@ -60,8 +60,15 @@ TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
 TARGET_COPY_OUT_VENDOR := vendor
 BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3547483648
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
+BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR := gzip
 BOARD_VENDORIMAGE_PARTITION_SIZE := 1547483648
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
+BOARD_VENDORIMAGE_SQUASHFS_COMPRESSOR := gzip
 
 # Disable scudo
 MALLOC_SVELTE := true
+
+# Offending entries:
+# /system/etc/libnfc-nci.conf
+BUILD_BROKEN_DUP_RULES := true
diff --git a/device.mk b/device.mk
index ae3899b..56f2e46 100644
--- a/device.mk
+++ b/device.mk
@@ -30,7 +30,6 @@ PRODUCT_PACKAGES += \
     audio.primary.waydroid \
     audio.r_submix.default \
     audio.usb.default \
-    audio.a2dp.default \
     libasound_module_pcm_pulse \
     libasound_module_ctl_pulse \
     libasound_module_conf_pulse
@@ -63,9 +62,10 @@ PRODUCT_PACKAGES += \
     hwcomposer.waydroid
 
 PRODUCT_PACKAGES += \
-    libEGL_swiftshader \
-    libGLESv1_CM_swiftshader \
-    libGLESv2_swiftshader
+    libEGL_angle \
+    libGLESv1_CM_angle \
+    libGLESv2_angle \
+    vulkan.pastel
 
 ifneq ($(TARGET_USE_MESA),false)
 PRODUCT_PACKAGES += \
@@ -151,7 +151,9 @@ PRODUCT_PACKAGES += \
     NfcNci
 
 # Overlays
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
+DEVICE_PACKAGE_OVERLAYS += \
+    $(LOCAL_PATH)/overlay \
+    $(LOCAL_PATH)/overlay-lineage
 
 # Permissions
 PRODUCT_COPY_FILES += \
@@ -200,16 +202,12 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
 
-# VNDK
-PRODUCT_PACKAGES += \
-    ld.config.vndk_lite.txt
-
 # Binder IPC
 PRODUCT_PACKAGES += \
     vndservicemanager
 
 ifeq ($(filter %_waydroid_x86 %_waydroid_x86_64,$(TARGET_PRODUCT)),)
-PRODUCT_EXTRA_VNDK_VERSIONS := 28 29
+PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 30
 endif
 
 # Updater
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
new file mode 100644
index 0000000..0d0ceac
--- /dev/null
+++ b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2023 The Waydroid Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <!-- Default values for status bar DT2S gesture -->
+    <bool name="config_dt2sGestureAvailable">false</bool>
+    <bool name="config_dt2sGestureEnabledByDefault">false</bool>
+</resources>