diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/Makefile b/feeds/ipq807x_v5.4/ath11k-wifi/Makefile
index 01e30c06f..087025014 100755
--- a/feeds/ipq807x_v5.4/ath11k-wifi/Makefile
+++ b/feeds/ipq807x_v5.4/ath11k-wifi/Makefile
@@ -52,8 +52,6 @@ ALLWIFIBOARDS:= \
 	wallys-dr5018 \
 	wallys-dr6018 \
 	wallys-dr6018-v4 \
-	sonicfi-rap630c-311g \
-	sonicfi-rap630w-311g \
 	sonicfi-rap630w-312g \
 	sonicfi-rap650c \
 	sonicfi-rap630e \
@@ -207,6 +205,16 @@ $(call Package/ath11k-wifi-default)
     TITLE:=cig-wf188n bdf
 endef
 
+define Package/ath11k-wifi-sonicfi-rap630c-311g
+$(call Package/ath11k-wifi-default)
+    TITLE:=sonicfi-rap630c-311g bdf
+endef
+
+define Package/ath11k-wifi-sonicfi-rap630w-311g
+$(call Package/ath11k-wifi-default)
+    TITLE:=sonicfi-rap630w-311g bdf
+endef
+
 define ath11k-wifi-install-one-to
   $(INSTALL_DIR)  $(2)/lib/firmware/$(3)/
   $(INSTALL_DATA) $(1) $(2)/lib/firmware/$(3)/board.bin
@@ -419,6 +427,32 @@ 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
 
+define Package/ath11k-wifi-sonicfi-rap630c-311g/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-au.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.AU
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-ca.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-sg.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.SG
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-us.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-au.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.AU
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-ca.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-sg.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.SG
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-us.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US
+endef
+
+define Package/ath11k-wifi-sonicfi-rap630w-311g/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-au.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.AU
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-ca.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-sg.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.SG
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-us.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-au.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.AU
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-ca.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-sg.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.SG
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-us.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US
+endef
+
 $(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))
@@ -441,8 +475,6 @@ $(eval $(call generate-ath11k-wifi-package,liteon-wpx8324,Liteon WPX8324))
 $(eval $(call generate-ath11k-wifi-package,indio-um-310ax-v1,Indio UM-310AX V1))
 $(eval $(call generate-ath11k-wifi-package,indio-um-510axp-v1,Indio UM-510AXP V1))
 $(eval $(call generate-ath11k-wifi-package,indio-um-510axm-v1,Indio UM-510AXM V1))
-$(eval $(call generate-ath11k-wifi-package,sonicfi-rap630c-311g,Sonicfi RAP630C 311G))
-$(eval $(call generate-ath11k-wifi-package,sonicfi-rap630w-311g,Sonicfi RAP630W 311G))
 $(eval $(call generate-ath11k-wifi-package,sonicfi-rap630w-312g,Sonicfi RAP630W 312G))
 $(eval $(call generate-ath11k-wifi-package,sonicfi-rap650c,SonicFi RAP650C))
 $(eval $(call generate-ath11k-wifi-package,sonicfi-rap630e,SonicFi RAP630E))
@@ -479,3 +511,5 @@ $(eval $(call BuildPackage,ath11k-wifi-hfcl-ion4xi_HMR))
 $(eval $(call BuildPackage,ath11k-wifi-edgecore-oap101))
 $(eval $(call BuildPackage,ath11k-wifi-edgecore-oap101e))
 $(eval $(call BuildPackage,ath11k-wifi-cig-wf188n))
+$(eval $(call BuildPackage,ath11k-wifi-sonicfi-rap630c-311g))
+$(eval $(call BuildPackage,ath11k-wifi-sonicfi-rap630w-311g))
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-au.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-au.bin.IPQ5018
new file mode 100755
index 000000000..c715647bf
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-au.bin.IPQ5018 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-au.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-au.bin.QCN6122
new file mode 100755
index 000000000..b7afd0d1f
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-au.bin.QCN6122 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-ca.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-ca.bin.IPQ5018
new file mode 100755
index 000000000..7065b1b49
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-ca.bin.IPQ5018 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-ca.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-ca.bin.QCN6122
new file mode 100755
index 000000000..71ab90d0d
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-ca.bin.QCN6122 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-sg.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-sg.bin.IPQ5018
new file mode 100755
index 000000000..63e6c6bf4
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-sg.bin.IPQ5018 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-sg.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-sg.bin.QCN6122
new file mode 100755
index 000000000..df57eb267
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-sg.bin.QCN6122 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-us.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-us.bin.IPQ5018
new file mode 100755
index 000000000..8fd712175
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-us.bin.IPQ5018 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-us.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-us.bin.QCN6122
new file mode 100755
index 000000000..13fe8c447
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630c-311g-us.bin.QCN6122 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-au.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-au.bin.IPQ5018
new file mode 100755
index 000000000..ae7361c8b
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-au.bin.IPQ5018 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-au.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-au.bin.QCN6122
new file mode 100755
index 000000000..fa184dae1
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-au.bin.QCN6122 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-ca.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-ca.bin.IPQ5018
new file mode 100755
index 000000000..6ca58d259
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-ca.bin.IPQ5018 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-ca.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-ca.bin.QCN6122
new file mode 100755
index 000000000..645f26ae8
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-ca.bin.QCN6122 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-sg.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-sg.bin.IPQ5018
new file mode 100755
index 000000000..43a3b0232
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-sg.bin.IPQ5018 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-sg.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-sg.bin.QCN6122
new file mode 100755
index 000000000..548d16934
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-sg.bin.QCN6122 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-us.bin.IPQ5018 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-us.bin.IPQ5018
new file mode 100755
index 000000000..d0f3451f5
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-us.bin.IPQ5018 differ
diff --git a/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-us.bin.QCN6122 b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-us.bin.QCN6122
new file mode 100755
index 000000000..4bf645248
Binary files /dev/null and b/feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-311g-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 f750472c7..c4091f64c 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
@@ -254,27 +254,39 @@ ath11k-macs)
 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
-                ;;
+	cig,wf186h|\
+	sonicfi,rap630c-311g|\
+	sonicfi,rap630w-311g)
+		country=`cat /etc/ucentral/country`
+		if [ "$country" == "AU" ]; then
+			ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.AU /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
+		elif [ "$country" == "CA" ]; then
+			ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
+		elif [ "$country" == "SG" ]; then
+			ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.SG /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
-                ;;
+	cig,wf186h|\
+	sonicfi,rap630c-311g|\
+	sonicfi,rap630w-311g)
+		country=`cat /etc/ucentral/country`
+		if [ "$country" == "AU" ]; then
+			ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.AU /lib/firmware/ath11k/qcn6122/hw1.0/board.bin
+		elif [ "$country" == "CA" ]; then
+			ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA /lib/firmware/ath11k/qcn6122/hw1.0/board.bin
+		elif [ "$country" == "SG" ]; then
+			ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.SG /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
 	;;
 *)
diff --git a/feeds/qca-wifi-7/ath12k-wifi/Makefile b/feeds/qca-wifi-7/ath12k-wifi/Makefile
index d82328905..699c45983 100755
--- a/feeds/qca-wifi-7/ath12k-wifi/Makefile
+++ b/feeds/qca-wifi-7/ath12k-wifi/Makefile
@@ -122,8 +122,12 @@ endef
 define Package/ath12k-wifi-sonicfi-rap7110c-341x/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
-	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x-us.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x-au.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.AU
+	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x-au.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.AU
+	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x-sg.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.SG
+	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x-sg.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.SG
 endef
 
 define Package/ath12k-wifi-sonicfi-rap750e-h/install
@@ -147,8 +151,12 @@ endef
 define Package/ath12k-wifi-sonicfi-rap750w-311a/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.rap750w_311a.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
-	$(INSTALL_DATA) ./board-2.bin.rap750w_311a.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.rap750w_311a-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.rap750w_311a-us.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.rap750w_311a-au.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.AU
+	$(INSTALL_DATA) ./board-2.bin.rap750w_311a-au.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.AU
+	$(INSTALL_DATA) ./board-2.bin.rap750w_311a-sg.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.SG
+	$(INSTALL_DATA) ./board-2.bin.rap750w_311a-sg.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.SG
 #	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/regdb.bin
 	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
 endef
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2-rap7110c_341x-IPQ5332.json b/feeds/qca-wifi-7/ath12k-wifi/board-2-rap7110c_341x-IPQ5332.json
deleted file mode 100755
index 87e9f8b16..000000000
--- a/feeds/qca-wifi-7/ath12k-wifi/board-2-rap7110c_341x-IPQ5332.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-    {
-        "board": [
-            {
-                "names": [
-                    "bus=ahb,qmi-chip-id=0,qmi-board-id=18"
-                ],
-                "data": "rap7110c_341x-IPQ5332.bin"
-            }
-        ],
-        "regdb": [
-            {
-                "names": [
-                    "bus=ahb,qmi-chip-id=0,qmi-board-id=255"
-                ],
-                "data": "ipq5332.regdb"
-            }
-        ]
-    }
-]
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2-rap7110c_341x-QCN92XX.json b/feeds/qca-wifi-7/ath12k-wifi/board-2-rap7110c_341x-QCN92XX.json
deleted file mode 100755
index 69497e6d6..000000000
--- a/feeds/qca-wifi-7/ath12k-wifi/board-2-rap7110c_341x-QCN92XX.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-    {
-        "board": [
-            {
-                "names": [
-                    "bus=pci,qmi-chip-id=0,qmi-board-id=4117"
-                ],
-                "data": "rap7110c_341x-QCN92xx.bin"
-            }
-        ],
-        "regdb": [
-            {
-                "names": [
-                    "bus=pci,qmi-chip-id=0,qmi-board-id=255"
-                ],
-                "data": "qcn92xx.regdb"
-            }
-        ]
-    }
-]
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-au.IPQ5332 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-au.IPQ5332
new file mode 100755
index 000000000..1d086906b
Binary files /dev/null and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-au.IPQ5332 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-au.QCN92XX b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-au.QCN92XX
new file mode 100755
index 000000000..19d85204e
Binary files /dev/null and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-au.QCN92XX differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x.IPQ5332 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-sg.IPQ5332
old mode 100644
new mode 100755
similarity index 97%
rename from feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x.IPQ5332
rename to feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-sg.IPQ5332
index e9d26a757..b2d22dea4
Binary files a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x.IPQ5332 and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-sg.IPQ5332 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x.QCN92XX b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-sg.QCN92XX
similarity index 96%
rename from feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x.QCN92XX
rename to feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-sg.QCN92XX
index 5eb5673ac..79fd1559c 100755
Binary files a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x.QCN92XX and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-sg.QCN92XX differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-us.IPQ5332 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-us.IPQ5332
new file mode 100755
index 000000000..d48ecf3a4
Binary files /dev/null and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-us.IPQ5332 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-us.QCN92XX b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-us.QCN92XX
new file mode 100755
index 000000000..eb84c4e06
Binary files /dev/null and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap7110c_341x-us.QCN92XX differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-au.IPQ5332 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-au.IPQ5332
new file mode 100755
index 000000000..66a1ea734
Binary files /dev/null and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-au.IPQ5332 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-au.QCN6432 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-au.QCN6432
new file mode 100755
index 000000000..73b3eb911
Binary files /dev/null and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-au.QCN6432 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-sg.IPQ5332 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-sg.IPQ5332
new file mode 100755
index 000000000..82da2b5fc
Binary files /dev/null and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-sg.IPQ5332 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-sg.QCN6432 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-sg.QCN6432
new file mode 100755
index 000000000..81abb5c4b
Binary files /dev/null and b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-sg.QCN6432 differ
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a.IPQ5332 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-us.IPQ5332
similarity index 100%
rename from feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a.IPQ5332
rename to feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-us.IPQ5332
diff --git a/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a.QCN6432 b/feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-us.QCN6432
similarity index 100%
rename from feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a.QCN6432
rename to feeds/qca-wifi-7/ath12k-wifi/board-2.bin.rap750w_311a-us.QCN6432
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 f8c9dc194..4eed2bda0 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
@@ -131,40 +131,56 @@ ath12k/IPQ5332/hw1.0/board-2.bin)
 	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
-                ;;
+	cig,wf672|\
+	sonicfi,rap7110c-341x|\
+	sonicfi,rap750w-311a)
+		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
+		elif [ "$country" == "AU" ]; then
+			ln -s /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.AU /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+		elif [ "$country" == "SG" ]; then
+			ln -s /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.SG /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
-                ;;
+	cig,wf189w|\
+	sonicfi,rap750w-311a)
+		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
+		elif [ "$country" == "AU" ]; then
+			ln -s /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.AU /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+		elif [ "$country" == "SG" ]; then
+			ln -s /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.SG /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
-                ;;
+	cig,wf672|\
+	sonicfi,rap7110c-341x)
+		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
+		elif [ "$country" == "AU" ]; then
+			ln -s /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.AU /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+		elif [ "$country" == "SG" ]; then
+			ln -s /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.SG /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
 	;;
 *)
diff --git a/feeds/qca-wifi-7/ipq53xx/base-files/etc/uci-defaults/30-uboot-envtools b/feeds/qca-wifi-7/ipq53xx/base-files/etc/uci-defaults/30_uboot-envtools
similarity index 100%
rename from feeds/qca-wifi-7/ipq53xx/base-files/etc/uci-defaults/30-uboot-envtools
rename to feeds/qca-wifi-7/ipq53xx/base-files/etc/uci-defaults/30_uboot-envtools
diff --git a/feeds/tip/certificates/files/usr/bin/mount_certs b/feeds/tip/certificates/files/usr/bin/mount_certs
index 24ba00245..98d228259 100755
--- a/feeds/tip/certificates/files/usr/bin/mount_certs
+++ b/feeds/tip/certificates/files/usr/bin/mount_certs
@@ -29,19 +29,30 @@ cig,wf672)
 	mmc_dev=$(echo $(find_mmc_part "cert") | sed 's/^.\{5\}//')
 	[ -n "$mmc_dev" ] && mount -t ext4 /dev/$mmc_dev /certificates
 	;;
-sonicfi,rap7*)
+sonicfi,rap*)
 	if [ "$(board_name)" = "sonicfi,rap7110c-341x" ]; then
 		mmc_dev=$(echo $(find_mmc_part "certificates") | sed 's/^.\{5\}//')
 		[ -n "$mmc_dev" ] && mount -t ext4 /dev/$mmc_dev /certificates
 	else
 		mtd=$(find_mtd_index certificates)
-		[ -n "$mtd" ] && mount -t ext4 /dev/mtdblock$mtd /certificates
+		if [ "$(head -c 4 /dev/mtd$mtd)" == "hsqs" ]; then
+			mount -t squashfs /dev/mtdblock$mtd /certificates
+			touch /tmp/squashfs
+		else
+			[ -n "$mtd" ] && mount -t ext4 /dev/mtdblock$mtd /certificates
+		fi
 	fi
 	if [ ! -f /certificates/cert.pem ] || [ ! -f /certificates/key.pem ]; then
-		part=$(tar_part_lookup "0:BOOTCONFIG" "0:BOOTCONFIG1")
+		#part=$(tar_part_lookup "0:BOOTCONFIG" "0:BOOTCONFIG1")
+		part=$(tar_part_lookup "devinfo" "certificates")
 		if [ -n "part" ]; then
-			mmc_dev=$(echo $(find_mmc_part "$part") | sed 's/^.\{5\}//')
-			[ -n "$mmc_dev" ] && tar xf /dev/$mmc_dev -C /certificates
+			if [ "$(board_name)" = "sonicfi,rap7110c-341x" ]; then
+				mmc_dev=$(echo $(find_mmc_part "$part") | sed 's/^.\{5\}//')
+				[ -n "$mmc_dev" ] && tar xf /dev/$mmc_dev -C /certificates
+			else
+				mtd=$(find_mtd_index $part)
+				[ -n "$mtd" ] && tar xf /dev/mtdblock$mtd -C /certificates
+			fi
 		fi
 	fi
 	;;
@@ -59,17 +70,22 @@ yuncore,ax820)
 		[ -n "$mtd" ] && tar xf /dev/mtdblock$mtd -C /certificates
 	fi
 	;;
-sonicfi,rap6*)
+sonicfi,rap9*)
+echo "@@@ mount certificates with rapXXX" > /dev/console
 	mtd=$(find_mtd_index certificates)
 	if [ "$(head -c 4 /dev/mtd$mtd)" == "hsqs" ]; then
 		mount -t squashfs /dev/mtdblock$mtd /mnt
 		cp /mnt/* /certificates
+		touch /tmp/squashfs
+		rm -f /certificates/ucentral.defaults
 		umount /mnt
 	fi
-	part=$(tar_part_lookup "devinfo" "certificates")
-	if [ -n "$part" ]; then
-		mtd=$(find_mtd_index $part)
-		[ -n "$mtd" ] && tar xf /dev/mtdblock$mtd -C /certificates
+	if [ ! -f /certificates/cert.pem ] || [ ! -f /certificates/key.pem ]; then
+		part=$(tar_part_lookup "devinfo" "certificates")
+		if [ -n "$part" ]; then
+			mtd=$(find_mtd_index $part)
+			[ -n "$mtd" ] && tar xf /dev/mtdblock$mtd -C /certificates
+		fi
 	fi
 	;;
 *)
diff --git a/feeds/ucentral/ucentral-schema/files/etc/board.d/04-regdm b/feeds/ucentral/ucentral-schema/files/etc/board.d/04-regdm
index 2b4d42029..e17579763 100755
--- a/feeds/ucentral/ucentral-schema/files/etc/board.d/04-regdm
+++ b/feeds/ucentral/ucentral-schema/files/etc/board.d/04-regdm
@@ -22,6 +22,12 @@ cig,wf188n)
 cig,wf196)
         ucidef_set_wifi_country "US CA"
         ;;
+sonicfi,rap630c-311g|\
+sonicfi,rap630w-311g|\
+sonicfi,rap7110c-341x|\
+sonicfi,rap750w-311a)
+	ucidef_set_wifi_country "US AU CA SG"
+	;;
 esac
 
 board_config_flush