diff --git a/rw-system.sh b/rw-system.sh
index 7504d46..6f1857a 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -226,10 +226,8 @@ if getprop ro.vendor.build.fingerprint | grep -qE -e ".*(crown|star)[q2]*lte.*"
 fi
 
 if getprop ro.vendor.build.fingerprint |grep -iq -E -e 'huawei|honor' || getprop persist.sys.overlay.huawei |grep -iq -E -e 'true' ; then
-        boardname=$(getprop ro.board.boardname | cut -d "_" -f1 | tr '[:upper:]' '[:lower:]')
-        modeltype=$(getprop ro.board.boardname | cut -d "_" -f2 | tr '[:lower:]' '[:upper:]')
-	mount -o bind /product/etc/nfc/libnfc-nxp_${boardname}_${modeltype}.conf /system/etc/libnfc-nxp.conf
-	mount -o bind /product/etc/nfc/libnfc_brcm_${boardname}_${modeltype}.conf /system/etc/libnfc-brcm.conf
+	mount -o bind /product/etc/nfc/libnfc-nxp_*_*.conf /system/etc/libnfc-nxp.conf
+	mount -o bind /product/etc/nfc/libnfc_brcm_*_*.conf /system/etc/libnfc-brcm.conf
 	mount -o bind /system/phh/libnfc-nci-huawei.conf /system/etc/libnfc-nci.conf
 fi