diff --git a/device.mk b/device.mk
index a32e05a..29b3881 100644
--- a/device.mk
+++ b/device.mk
@@ -102,9 +102,9 @@
 	android.hardware.audio@6.0 \
 	android.hardware.audio.common@6.0 \
 	android.hardware.audio.common@6.0-util \
-	android.hardware.audio@6.0-impl:32 \
+	android.hardware.audio@6.0-impl \
 	android.hardware.audio.effect@6.0 \
-	android.hardware.audio.effect@6.0-impl:32 \
+	android.hardware.audio.effect@6.0-impl \
 	android.hardware.audio.service \
 	android.hardware.soundtrigger@2.1-impl \
 	audio.a2dp.default \
@@ -217,11 +217,11 @@
 	AntHalService \
 	antradio_app \
 	com.dsi.ant@1.0 \
+	com.dsi.ant@1.0.vendor \
 	libantradio
 
 # Bluetooth
 PRODUCT_PACKAGES += \
-	libbt-vendor \
 	audio.bluetooth.default \
 	android.hardware.bluetooth.audio@2.0-impl \
 	android.hardware.bluetooth@1.0 \
@@ -338,6 +338,7 @@
 	libdisplayconfig \
 	libqdutils \
 	libqdMetaData \
+	libqdMetaData.system_ext \
 	libvulkan \
 	vendor.qti.hardware.display.composer@3.0
 
@@ -457,7 +458,7 @@
 LOC_HIDL_VERSION := 4.0
 
 PRODUCT_PACKAGES += \
-	android.hardware.gnss@2.1-impl-qti:64 \
+	android.hardware.gnss@2.1-impl-qti \
 	android.hardware.gnss@2.1-service-qti \
 	libbatching \
 	libgeofencing \
@@ -722,6 +723,10 @@
 # If building from source then drop proprietary dependency
 ifeq ($(TARGET_USE_WCNSS_HAL),true)
 TARGET_USES_QCOM_WCNSS_QMI := false
+
+PRODUCT_PACKAGES += \
+	libwcnss_qmi \
+	wcnss_service
 endif
 
 # WiFi HAL
@@ -737,12 +742,10 @@
 	hostapd_default.conf \
 	libnl \
 	libqsap_sdk \
-	libwcnss_qmi \
 	libwifi-hal-qcom \
 	libwpa_client \
 	p2p_supplicant_overlay.conf \
 	vendor.qti.hardware.wifi.supplicant@1.0.vendor \
-	wcnss_service \
 	wificond \
 	wpa_cli \
 	wpa_supplicant.conf \