diff --git a/device/testing/device-samsung-goyawifi/APKBUILD b/device/testing/device-samsung-goyawifi/APKBUILD
index f5ffcd488..f13ebc20a 100644
--- a/device/testing/device-samsung-goyawifi/APKBUILD
+++ b/device/testing/device-samsung-goyawifi/APKBUILD
@@ -84,9 +84,9 @@ fix_lightdm() {
 sha512sums="
 10fd6444d5d8a9a67eca2fa063f135aa25e992c137291bc38e200fb7d1772efa98dbeea94648ee87a73c871c5d06abe65ca495618f8103b7f79b77326a351838  deviceinfo
 73d03f53e08a650b3073e33653d3bcfa6951042203dde7104ffddbe59e29bafbb26c0e41cd9357ede8f01abe0049b190a2acae82e5a5b92868129ab66b118a8d  goyawifi.conf
-4bb1136341de6584baeffafe166ceca1c883ba36eebe8d3d5ac95db7d4dfc243e2988be429f8f4e1e98385701598806730debc6cc2f502e2b98bf7a9a444b129  sd8xxx.conf
+23c88588dc8859512b15dc54027cfb23aa3783d746eace21ed919ed769f6ed5d0dd89bfbdb6d7285e5dc7d1fa7e921411df0d40ef7ca4d32d6a51274845726dc  sd8xxx.conf
 c1c9b58b5325ad11afc98bf1b20179c725b7627416270fe87558bdc259fbb996628d404aaaef6e8c9ea41c21b015ae767ce1c3054490481c24cc97d0002d69bb  dhcp-client.conf
-6d7178d18288f4ca9b8ad70b9fd9a28882c1a724448c9e4866224d6ffb5d1e7580ef402701b59cc67f880c7edcecd24ba37deba461ec1ed51889c5eb6bf2350a  ipv4-workaround.sh
+94a84eb3c91108596e8edcb0a615ce642a37af4092011845d2c0e7214b3c2daa6c51ca9951501be9277c7c0d3c71c32a0bca60d806d284a97a350db4a9e9bbd2  ipv4-workaround.sh
 861270c6bc0b2a3e6cd389c21c8c895e62de8cf8bec6fcf23c178f8cbaae855d62b0ee98692671ab4f518d84cb43dd0b2fe46f5a609f65af6a6c06e0fdbb6d0c  etc-lightdm-lightdm.conf
 efcf13b927a984bc99b86ea0fee907a7be555d02bb38cc7e020c53120be8a1cd9c53ec1754b316b6422621fc13768e81fd00b837713178f5024e12664dad47d5  initfs-hook.sh
 a947334f0e8a3b46ab7905a7291ea0cb94b4f73303ec1f7307478a5a7a316300907af033eb58035044738701185ef715ff22eb168f2eba281728d2ef039ffac9  HiFi.conf
diff --git a/device/testing/device-samsung-goyawifi/ipv4-workaround.sh b/device/testing/device-samsung-goyawifi/ipv4-workaround.sh
index 3b3c126f3..bce8b5a8f 100644
--- a/device/testing/device-samsung-goyawifi/ipv4-workaround.sh
+++ b/device/testing/device-samsung-goyawifi/ipv4-workaround.sh
@@ -6,7 +6,7 @@
 IF=$1
 STATUS=$2
 
-if [ "$IF" == "mlan0" ]; then
+if [ "$IF" == "wlan0" ]; then
 	if [ "$STATUS" == "up" ]; then
 		logger -s "Setting IP on $IF"
 		logger -s "IP4_ADDRESS_0 $IP4_ADDRESS_0"
diff --git a/device/testing/device-samsung-goyawifi/sd8xxx.conf b/device/testing/device-samsung-goyawifi/sd8xxx.conf
index 31679f6de..bc7f4c622 100644
--- a/device/testing/device-samsung-goyawifi/sd8xxx.conf
+++ b/device/testing/device-samsung-goyawifi/sd8xxx.conf
@@ -1,2 +1,3 @@
-# Load sd8xxx.ko at boot
-sd8xxx
+# Load wireless and bluetooth module, at boot
+sd8xxx fw_name=/mrvl/sd8777_uapsta.bin cal_data_cfg=/mrvl/cal_data.conf cfg80211_wext=0xf sta_name=wlan wfd_name=p2p drv_mode=0x5
+mbt8xxx init_cfg=/mrvl/bt_init_cfg.conf cal_cfg=/mrvl/bt_cal_data.conf
diff --git a/device/testing/linux-samsung-goyawifi/APKBUILD b/device/testing/linux-samsung-goyawifi/APKBUILD
index c8686d4e7..0f589ce00 100644
--- a/device/testing/linux-samsung-goyawifi/APKBUILD
+++ b/device/testing/linux-samsung-goyawifi/APKBUILD
@@ -68,7 +68,7 @@ package() {
 
 sha512sums="
 acaa8d554c7c51c5365e98e3c19eedd2b2a24b877ca8ed9d84e547339e9b055165f53d62be47be04e1be5967f14c859254633fd9bd5b9052f428e5e55e8793bf  linux-samsung-goyawifi-fb2f8b6cd86864c0fcac790e97a372b1772003c7.tar.gz
-822e215482f054fdcd4e068334aa61fb034a8ae133c374b2e851c5713e2b410b855e791af2a71c3ce32eafe623e2e3e27a7bb84173f26f178acf4e8e3dfa560f  config-samsung-goyawifi.armv7
+dc05faa5d1d6d219ae7397fb8875af8cbc86d8365de5976545d6c2914035e817e2bc91f49d30f054d8bdb90a96f763b24a67ce80085927d0d038b593619b2c51  config-samsung-goyawifi.armv7
 efd1641c0892fddb9c5feea3e49e534fed311b01f0576688b5af766e0160850822d0eb8e296b08c5f82b586d5d0336a98e8e86707ba9af7fcf36fc89f0b288eb  fix_memset-related_crashes.patch
 5c080c27716d124616e4e684fc63bffb2665f00de06e894dfd78f58588feec2fec858fe8234b054061e3db14d28cb90fbac53f4b54c4fac5946d843cf038386c  fix_the_memset_fix.patch
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
diff --git a/device/testing/linux-samsung-goyawifi/config-samsung-goyawifi.armv7 b/device/testing/linux-samsung-goyawifi/config-samsung-goyawifi.armv7
index 3aaf9c333..459705738 100644
--- a/device/testing/linux-samsung-goyawifi/config-samsung-goyawifi.armv7
+++ b/device/testing/linux-samsung-goyawifi/config-samsung-goyawifi.armv7
@@ -917,15 +917,14 @@ CONFIG_BT_HIDP=y
 #
 # Bluetooth device drivers
 #
-CONFIG_BT_HCIBTSDIO=y
-CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART_BCSP is not set
-# CONFIG_BT_HCIUART_ATH3K is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIVHCI=m
+# CONFIG_BT_MRVL is not set
 # CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y