diff --git a/gtaxlwifi-vendor.mk b/gtaxlwifi-vendor.mk
index adf4e27c..8ce9e66b 100644
--- a/gtaxlwifi-vendor.mk
+++ b/gtaxlwifi-vendor.mk
@@ -5,10 +5,10 @@
 PRODUCT_SOONG_NAMESPACES += \
     vendor/samsung/gtaxlwifi
 
-# WiFi firmware - partly from T390XXS9CUG1, partly from T585XXS6CTJ7
+# WiFi firmware - partly from T395XXSDCVA1, partly as in T585XXS6CTJ7
 # bdwlan30.bin and utfbd30.bin are as in the T585XXS6CTJ7 firmware, and are also copies of bdwlan32.bin
-# and utfbd32.bin as in the T390XXS9CUG1 firmware respectively. With bdwlan30.bin and utfbd30.bin from
-# the T390XXS9CUG1 firmware, WiFi regulatory domain selection doesn't work properly.
+# and utfbd32.bin as in the T395XXSDCVA1 firmware respectively. With bdwlan30.bin and utfbd30.bin from
+# the T395XXSDCVA1 firmware, WiFi regulatory domain selection doesn't work properly.
 PRODUCT_COPY_FILES += \
     vendor/samsung/gtaxlwifi/proprietary/etc/firmware/bdwlan30.bin:$(TARGET_COPY_OUT_SYSTEM)/etc/firmware/bdwlan30.bin \
     vendor/samsung/gtaxlwifi/proprietary/etc/firmware/bdwlan32.bin:$(TARGET_COPY_OUT_SYSTEM)/etc/firmware/bdwlan32.bin \
@@ -20,7 +20,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/gtaxlwifi/proprietary/etc/firmware/utfbd30.bin:$(TARGET_COPY_OUT_SYSTEM)/etc/firmware/utfbd30.bin \
     vendor/samsung/gtaxlwifi/proprietary/etc/firmware/utfbd32.bin:$(TARGET_COPY_OUT_SYSTEM)/etc/firmware/utfbd32.bin
 
-# Bluetooth firmware - from T390XXS9CUG1
+# Bluetooth firmware - from T395XXSDCVA1
 PRODUCT_COPY_FILES += \
     vendor/samsung/gtaxlwifi/proprietary/vendor/firmware/nvm_tlv_tf_1.1.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/nvm_tlv_tf_1.1.bin \
     vendor/samsung/gtaxlwifi/proprietary/vendor/firmware/rampatch_tlv_tf_1.1.tlv:$(TARGET_COPY_OUT_VENDOR)/firmware/rampatch_tlv_tf_1.1.tlv
diff --git a/proprietary/etc/firmware/Data.msc b/proprietary/etc/firmware/Data.msc
index 398c6129..caa93310 100644
--- a/proprietary/etc/firmware/Data.msc
+++ b/proprietary/etc/firmware/Data.msc
@@ -1,4 +1,4 @@
-VERSION:140
+VERSION:142
 
 32768,,WLAN_MODULE_INF -  INF_DBGID_DEFINITION_START  
 32769,2I,WLAN_MODULE_INF -  INF_ASSERTION_FAILED 0x%x 0x%x
diff --git a/proprietary/etc/firmware/qwlan30.bin b/proprietary/etc/firmware/qwlan30.bin
index 2ec30509..e4ba5984 100644
Binary files a/proprietary/etc/firmware/qwlan30.bin and b/proprietary/etc/firmware/qwlan30.bin differ
diff --git a/proprietary/etc/firmware/utf30.bin b/proprietary/etc/firmware/utf30.bin
index b7202109..a128d250 100644
Binary files a/proprietary/etc/firmware/utf30.bin and b/proprietary/etc/firmware/utf30.bin differ