diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ba0690d..bc575ea 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -79,3 +79,11 @@ TARGET_COPY_OUT_VENDOR := vendor
 
 # VNDK
 BOARD_VNDK_VERSION := current
+
+# Wifi
+BOARD_WLAN_DEVICE                := slsi
+WPA_SUPPLICANT_VERSION           := VER_0_8_X
+BOARD_WPA_SUPPLICANT_DRIVER      := NL80211
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
+BOARD_HOSTAPD_DRIVER             := NL80211
+BOARD_HOSTAPD_PRIVATE_LIB        := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
diff --git a/lineage.dependencies b/lineage.dependencies
index cdaf909..b18755c 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -10,5 +10,13 @@
     {
         "repository": "android_hardware_samsung_slsi_libbt",
         "target_path": "hardware/samsung_slsi/libbt"
+    },
+    {
+        "repository": "android_hardware_samsung_slsi_scsc_wifibt_wifi_hal",
+        "target_path": "hardware/samsung_slsi/scsc_wifibt/wifi_hal"
+    },
+    {
+        "repository": "android_hardware_samsung_slsi_scsc_wifibt_wpa_supplicant_lib"
+        "target_path": "hardware/samsung_slsi/scsc_wifibt/wpa_supplicant_lib"
     }
 ]
diff --git a/manifest.xml b/manifest.xml
index 086c78c..474318f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -246,36 +246,6 @@
         </interface>
         <fqname>@1.1::IUsb/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.wifi</name>
-        <transport>hwbinder</transport>
-        <version>1.3</version>
-        <interface>
-            <name>IWifi</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.3::IWifi/default</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.wifi.hostapd</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IHostapd</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.1::IHostapd/default</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.wifi.supplicant</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>ISupplicant</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.2::ISupplicant/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>vendor.samsung.hardware.gnss</name>
         <transport>hwbinder</transport>
@@ -326,40 +296,6 @@
         <fqname>@2.0::ISehChannel/imsd</fqname>
         <fqname>@2.0::ISehChannel/imsd2</fqname>
     </hal>
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.wifi</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ISehWifi</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@2.0::ISehWifi/default</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.wifi.hostapd</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ISehHostapd</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@2.0::ISehHostapd/default</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.wifi.supplicant</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ISehSupplicant</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@2.0::ISehSupplicant/default</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.samsung_slsi.hardware.radio</name>
-        <transport>hwbinder</transport>
-    </hal>
     <hal format="hidl">
         <name>vendor.trustonic.tee</name>
         <transport>hwbinder</transport>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 7ce8e66..3cd92c3 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -196,15 +196,8 @@ vendor/lib/hw/thermal.universal7904.so
 vendor/lib64/hw/thermal.universal7904.so
 
 # WIFI
-vendor/bin/hw/android.hardware.wifi@1.0-service
-vendor/bin/hw/hostapd
 vendor/bin/hw/macloader
-vendor/bin/hw/vendor.samsung.hardware.wifi@2.0-service
-vendor/bin/hw/wpa_supplicant
 vendor/bin/wlbtd
-vendor/etc/init/android.hardware.wifi@1.0-service.rc
-vendor/etc/init/hostapd.android.rc
-vendor/etc/init/vendor.samsung.hardware.wifi@2.0-service.rc
 vendor/etc/init/wifi_slsi.rc
 vendor/etc/wifi/hydra_config.sdb
 vendor/etc/wifi/indoorchannel.info
@@ -220,14 +213,3 @@ vendor/etc/wifi/p2p_supplicant_overlay.conf
 vendor/etc/wifi/platform.txt
 vendor/etc/wifi/wpa_supplicant.conf
 vendor/etc/wifi/wpa_supplicant_overlay.conf
-vendor/lib/libwifi-hal.so
-vendor/lib/libwpa_client.so
-vendor/lib64/libkeystore-engine-wifi-hidl.so
-vendor/lib64/libkeystore-wifi-hidl.so
-vendor/lib64/libucsengine.so
-vendor/lib64/libwifi-hal.so
-vendor/lib64/libwpa_client.so
-vendor/lib64/vendor.samsung.frameworks.security.ucm.crypto@1.0.so
-vendor/lib64/vendor.samsung.hardware.wifi.hostapd@2.0.so
-vendor/lib64/vendor.samsung.hardware.wifi.supplicant@2.0.so
-vendor/lib64/vendor.samsung.hardware.wifi@2.0.so
diff --git a/universal7904-common.mk b/universal7904-common.mk
index 68bbbf0..d0bd50f 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -240,4 +240,7 @@ PRODUCT_COPY_FILES += \
 
 # Wifi
 PRODUCT_PACKAGES += \
-    TetheringConfigOverlay
+    android.hardware.wifi@1.0-service \
+    hostapd \
+    TetheringConfigOverlay \
+    wpa_supplicant