diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/Makefile b/feeds/ipq807x_v5.4/ath11k-wifi/Makefile
index d813e4be4..01e30c06f 100755
--- a/feeds/ipq807x_v5.4/ath11k-wifi/Makefile
+++ b/feeds/ipq807x_v5.4/ath11k-wifi/Makefile
@@ -24,8 +24,6 @@ endef
 #
 
 ALLWIFIBOARDS:= \
-	cig-wf186w \
-	cig-wf186h \
 	cig-wf660a \
 	cig-wf194c \
 	cig-wf194c4 \
@@ -108,6 +106,16 @@ $(call Package/ath11k-wifi-default)
     TITLE:=cig-wf196 bdf
 endef
 
+define Package/ath11k-wifi-cig-wf186w
+$(call Package/ath11k-wifi-default)
+    TITLE:=cig-wf186w bdf
+endef
+
+define Package/ath11k-wifi-cig-wf186h
+$(call Package/ath11k-wifi-default)
+    TITLE:=cig-wf186h bdf
+endef
+
 define Package/ath11k-wifi-gl-ax1800
 $(call Package/ath11k-wifi-default)
     TITLE:=gl-ax1800 bdf
@@ -284,6 +292,24 @@ define Package/ath11k-wifi-cig-wf196/install
 	$(INSTALL_DATA) ./board-cig-wf196-us.bin.IPQ8074 $(1)/lib/firmware/ath11k/IPQ8074/hw2.0/board.bin.US
 endef
 
+define Package/ath11k-wifi-cig-wf186w/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
+	$(INSTALL_DATA) ./board-cig-wf186w-us.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US
+	$(INSTALL_DATA) ./board-cig-wf186w-ca.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA
+	$(INSTALL_DATA) ./board-cig-wf186w-us.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US
+	$(INSTALL_DATA) ./board-cig-wf186w-ca.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA
+endef
+
+define Package/ath11k-wifi-cig-wf186h/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
+	$(INSTALL_DATA) ./board-cig-wf186h-us.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US
+	$(INSTALL_DATA) ./board-cig-wf186h-ca.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA
+	$(INSTALL_DATA) ./board-cig-wf186h-us.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US
+	$(INSTALL_DATA) ./board-cig-wf186h-ca.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA
+endef
+
 define Package/ath11k-wifi-optimcloud-d50/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCN9074/hw1.0/
@@ -393,8 +419,6 @@ define Package/ath11k-wifi-cig-wf188n/install
 	$(INSTALL_DATA) ./board-cig-wf188n-us.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board.bin.US
 endef
 
-$(eval $(call generate-ath11k-wifi-package,cig-wf186w,Cigtech WF186w))
-$(eval $(call generate-ath11k-wifi-package,cig-wf186h,Cigtech WF186h))
 $(eval $(call generate-ath11k-wifi-package,cig-wf660a,Cigtech WF660a))
 $(eval $(call generate-ath11k-wifi-package,cig-wf194c,Cigtech WF194c))
 $(eval $(call generate-ath11k-wifi-package,cig-wf194c4,Cigtech WF194c4))
@@ -440,6 +464,8 @@ $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq8074))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq6018))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-qcn9000))
 $(eval $(call BuildPackage,ath11k-wifi-cig-wf196))
+$(eval $(call BuildPackage,ath11k-wifi-cig-wf186w))
+$(eval $(call BuildPackage,ath11k-wifi-cig-wf186h))
 $(eval $(call BuildPackage,ath11k-wifi-motorola-q14))
 $(eval $(call BuildPackage,ath11k-wifi-optimcloud-d50))
 $(eval $(call BuildPackage,ath11k-wifi-optimcloud-d60))
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186h-ca.bin.IPQ5018
similarity index 100%
rename from feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w.bin.IPQ5018
rename to feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186h-ca.bin.IPQ5018
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186h-ca.bin.QCN6122
similarity index 100%
rename from feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w.bin.QCN6122
rename to feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186h-ca.bin.QCN6122
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186h.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186h-us.bin.IPQ5018
similarity index 100%
rename from feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186h.bin.IPQ5018
rename to feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186h-us.bin.IPQ5018
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186h.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186h-us.bin.QCN6122
similarity index 100%
rename from feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186h.bin.QCN6122
rename to feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186h-us.bin.QCN6122
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w-ca.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w-ca.bin.IPQ5018
new file mode 100755
index 000000000..0cb51ec37
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w-ca.bin.IPQ5018 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w-ca.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w-ca.bin.QCN6122
new file mode 100755
index 000000000..6dbd4240f
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w-ca.bin.QCN6122 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w-us.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w-us.bin.IPQ5018
new file mode 100755
index 000000000..0484ba7b6
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w-us.bin.IPQ5018 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w-us.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w-us.bin.QCN6122
new file mode 100755
index 000000000..af4c889d1
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-cig-wf186w-us.bin.QCN6122 differ
diff --git a/feeds/ipq807x_v5.4/ipq50xx/base-files/etc/hotplug.d/firmware/10-ath11k-caldata b/feeds/ipq807x_v5.4/ipq50xx/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
index c0f0e1c3e..f750472c7 100755
--- a/feeds/ipq807x_v5.4/ipq50xx/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
+++ b/feeds/ipq807x_v5.4/ipq50xx/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
@@ -251,6 +251,32 @@ ath11k-macs)
 		;;
 	esac
 	;;
+ath11k/IPQ5018/hw1.0/board.bin)
+	case "$board" in
+	cig,wf186w|\
+	cig,wf186h)
+                country=`cat /etc/ucentral/country`
+                if [ "$country" == "CA" ]; then
+                        ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
+                else
+                        ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
+                fi
+                ;;
+	esac
+	;;
+ath11k/qcn6122/hw1.0/board.bin)
+	case "$board" in
+	cig,wf186w|\
+	cig,wf186h)
+                country=`cat /etc/ucentral/country`
+                if [ "$country" == "CA" ]; then
+                        ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA /lib/firmware/ath11k/qcn6122/hw1.0/board.bin
+                else
+                        ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US /lib/firmware/ath11k/qcn6122/hw1.0/board.bin
+                fi
+                ;;
+	esac
+	;;
 *)
 	exit 1
 	;;
diff --git a/feeds/qca-wifi-7/ath12k-wifi/Makefile b/feeds/qca-wifi-7/ath12k-wifi/Makefile
index 2bbd506e5..d82328905 100755
--- a/feeds/qca-wifi-7/ath12k-wifi/Makefile
+++ b/feeds/qca-wifi-7/ath12k-wifi/Makefile
@@ -101,8 +101,8 @@ endef
 define Package/ath12k-wifi-cig-wf189/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.wf189.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
-	$(INSTALL_DATA) ./board-2.bin.wf189.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.wf189-us.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.wf189-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
 endef
 
 define Package/ath12k-wifi-edgecore-eap105/install
@@ -156,8 +156,8 @@ endef
 define Package/ath12k-wifi-cig-wf189w/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.189w.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
-	$(INSTALL_DATA) ./board-2.bin.189w.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.189w-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.189w-us.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US
 	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
 endef
 
@@ -165,8 +165,8 @@ endef
 define Package/ath12k-wifi-cig-wf189h/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.189h.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
-	$(INSTALL_DATA) ./board-2.bin.189h.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.189h-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.189h-us.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US
 	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
 endef
 
@@ -194,8 +194,8 @@ endef
 define Package/ath12k-wifi-cig-wf672/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.wf672.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
-	$(INSTALL_DATA) ./board-2.bin.wf672.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.wf672-us.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.wf672-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
 endef
 
 $(eval $(call BuildPackage,ath12k-wifi-cig-wf189))
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189h.IPQ5332 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189h-us.IPQ5332
similarity index 99%
rename from feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189h.IPQ5332
rename to feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189h-us.IPQ5332
index ccfab569c..f4cf70cec 100644
Binary files a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189h.IPQ5332 and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189h-us.IPQ5332 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189h.QCN6432 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189h-us.QCN6432
similarity index 99%
rename from feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189h.QCN6432
rename to feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189h-us.QCN6432
index 8c99c91be..ee9c43e4a 100644
Binary files a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189h.QCN6432 and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189h-us.QCN6432 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189w.IPQ5332 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189w-us.IPQ5332
similarity index 99%
rename from feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189w.IPQ5332
rename to feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189w-us.IPQ5332
index ccfab569c..f4cf70cec 100644
Binary files a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189w.IPQ5332 and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189w-us.IPQ5332 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189w.QCN6432 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189w-us.QCN6432
similarity index 99%
rename from feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189w.QCN6432
rename to feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189w-us.QCN6432
index 8c99c91be..ee9c43e4a 100644
Binary files a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189w.QCN6432 and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.189w-us.QCN6432 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf189.IPQ5332 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf189-us.IPQ5332
similarity index 100%
rename from feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf189.IPQ5332
rename to feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf189-us.IPQ5332
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf189.QCN92XX b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf189-us.QCN92XX
similarity index 100%
rename from feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf189.QCN92XX
rename to feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf189-us.QCN92XX
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf672.IPQ5332 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf672-us.IPQ5332
similarity index 100%
rename from feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf672.IPQ5332
rename to feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf672-us.IPQ5332
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf672.QCN92XX b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf672-us.QCN92XX
similarity index 100%
rename from feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf672.QCN92XX
rename to feeds/qca-wifi-7/ath12k-wifi/board-2.bin.wf672-us.QCN92XX
diff --git a/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network b/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network
index f407a9460..19ea35e20 100755
--- a/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network
+++ b/feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network
@@ -13,7 +13,6 @@ ipq53xx_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth1 eth2 eth3 eth4 eth5" "eth0"
 		;;
 	cig,wf189|\
-	cig,wf672|\
 	edgecore,eap105|\
 	sercomm,ap72tip|\
 	sonicfi,rap750w-311a)
@@ -32,6 +31,9 @@ ipq53xx_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
 		ucidef_add_switch "switch1" "0u@eth1" "3:lan" "2:lan"
 		;;
+	cig,wf672)
+		ucidef_set_interface_wan "eth0 eth1"
+		;;
 	emplus,wap7635|\
 	sercomm,ap72tip-v4)
 		ucidef_set_interface_wan "eth0"
diff --git a/feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata b/feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata
index 1ab7ea5c0..f8c9dc194 100755
--- a/feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata
+++ b/feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata
@@ -126,6 +126,47 @@ ath12k/QCN6432/hw1.0/cal-ahb-soc@0:wifi2@c0000000.bin)
 		;;
 	esac
 	;;
+ath12k/IPQ5332/hw1.0/board-2.bin)
+	case "$board" in
+	cig,wf189|\
+	cig,wf189h|\
+	cig,wf189w|\
+	cig,wf672)
+                country=`cat /etc/ucentral/country`
+                if [ "$country" == "CA" ]; then
+                        ln -s /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.CA /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+                else
+                        ln -s /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+                fi
+                ;;
+	esac
+	;;
+ath12k/QCN6432/hw1.0/board-2.bin)
+	case "$board" in
+	cig,wf189h|\
+	cig,wf189w)
+                country=`cat /etc/ucentral/country`
+                if [ "$country" == "CA" ]; then
+                        ln -s /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.CA /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+                else
+                        ln -s /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+                fi
+                ;;
+	esac
+	;;
+ath12k/QCN92XX/hw1.0/board-2.bin)
+	case "$board" in
+	cig,wf189|\
+	cig,wf672)
+                country=`cat /etc/ucentral/country`
+                if [ "$country" == "CA" ]; then
+                        ln -s /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.CA /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+                else
+                        ln -s /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+                fi
+                ;;
+	esac
+	;;
 *)
 	exit 1
 	;;