diff --git a/BoardConfig.mk b/BoardConfig.mk
index 31ea792..49ec7d5 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -242,5 +242,20 @@ DEVICE_MANIFEST_FILE := \
     $(DEVICE_PATH)/vintf/manifest.xml \
     $(DEVICE_PATH)/vintf/manifest_pineapple.xml \
 
+# Wi-Fi
+BOARD_WLAN_DEVICE := qcwcn
+BOARD_HOSTAPD_DRIVER := NL80211
+BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
+BOARD_WPA_SUPPLICANT_DRIVER := $(BOARD_HOSTAPD_DRIVER)
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := $(BOARD_HOSTAPD_PRIVATE_LIB)
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB_EVENT := "ON"
+CONFIG_IEEE80211AX := true
+WIFI_DRIVER_STATE_CTRL_PARAM := "/dev/wlan"
+WIFI_DRIVER_STATE_OFF := "OFF"
+WIFI_DRIVER_STATE_ON := "ON"
+WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
+WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
+WPA_SUPPLICANT_VERSION := VER_0_8_X
+
 # Inherit the proprietary files
 include vendor/samsung/e3q/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 77775c9..cbf7066 100644
--- a/device.mk
+++ b/device.mk
@@ -29,7 +29,29 @@ PRODUCT_SHIPPING_API_LEVEL := $(BOARD_SHIPPING_API_LEVEL)
 
 # Audio
 PRODUCT_PACKAGES += \
-    libagmmixer
+    android.hardware.audio@7.1-impl \
+    android.hardware.audio.effect@7.0-impl \
+    android.hardware.audio.service \
+    android.hardware.bluetooth.audio-impl \
+    android.hardware.soundtrigger@2.3-impl \
+    audio.bluetooth.default \
+    audio.r_submix.default \
+    audio.usb.default \
+    audioadsprpcd \
+    libagm_compress_plugin \
+    libagm_mixer_plugin \
+    libagm_pcm_plugin \
+    libbatterylistener \
+    libfmpal \
+    libhfp_pal \
+    libqcompostprocbundle \
+    libqcomvisualizer \
+    libqcomvoiceprocessing \
+    libsndcardparser \
+    libtinycompress \
+    libvolumelistener
+
+AUDIO_HAL_DIR := hardware/qcom-caf/sm8650/audio/primary-hal
 
 # Bluetooth
 
@@ -211,6 +233,13 @@ PRODUCT_PACKAGES += \
 
 # Wi-Fi
 PRODUCT_PACKAGES += \
+    android.hardware.wifi-service \
+    hostapd \
+    libwpa_client \
+    libwifi-hal-ctrl \
+    libwifi-hal-qcom \
+    wpa_supplicant \
+    wpa_supplicant.conf \
     firmware_wlanmdsp.otaupdate_symlink \
     firmware_wlan_mac.bin_symlink \
     firmware_WCNSS_qcom_cfg.ini_symlink
diff --git a/proprietary-files.txt b/proprietary-files.txt
index d77252e..e916488 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -498,9 +498,13 @@ vendor/etc/init/vendor.qti.rmt_storage.rc
 
 # RIL
 vendor/bin/irsc_util
+vendor/bin/qms;DISABLE_CHECKELF
+vendor/etc/init/qms.rc
+vendor/etc/init/vendor.samsung.rilchip.qcom.rc
 vendor/etc/sec_config_oem
 vendor/lib64/libqdpr.so
 vendor/lib64/libsecril-client.so;MODULE_SUFFIX=_vendor
+vendor/lib64/vendor.qti.hardware.bttpi-V3-ndk.so
 
 # Secure element
 vendor/bin/hw/android.hardware.secure_element-service.nxp