diff --git a/feeds/qca/ipq53xx/config-6.1 b/feeds/qca/ipq53xx/config-6.1
index fc855c089..f3d0c7eeb 100644
--- a/feeds/qca/ipq53xx/config-6.1
+++ b/feeds/qca/ipq53xx/config-6.1
@@ -1214,5 +1214,6 @@ CONFIG_HWMON=y
 # CONFIG_BOOTCONFIG_PARTITION is not set
 CONFIG_ARM_PMU=y
 # CONFIG_SECCRYPT is not set
+CONFIG_REALTEK_PHY=y
 CONFIG_RTK_MSSDK_PHY=y
 # CONFIG_NF_CONNTRACK_CHAIN_EVENTS is not set
diff --git a/feeds/qca/ipq53xx/dts/ipq5332-cig-wf189.dts b/feeds/qca/ipq53xx/dts/ipq5332-cig-wf189.dts
index 5810c9c9f..876e91d85 100644
--- a/feeds/qca/ipq53xx/dts/ipq5332-cig-wf189.dts
+++ b/feeds/qca/ipq53xx/dts/ipq5332-cig-wf189.dts
@@ -42,12 +42,10 @@
 
 			phy0: ethernet-phy@0 {
 				reg = <8>;
-				compatible ="ethernet-phy-ieee802.3-c45";
-			//	fixup;
 			};
+
 			phy1: ethernet-phy@1 {
 				reg = <12>;
-			//	fixup;
 			};
 		};
 
diff --git a/feeds/qca/ipq53xx/dts/ipq5332-edgecore-eap105.dts b/feeds/qca/ipq53xx/dts/ipq5332-edgecore-eap105.dts
index 2f0a244ee..c1819a8e4 100644
--- a/feeds/qca/ipq53xx/dts/ipq5332-edgecore-eap105.dts
+++ b/feeds/qca/ipq53xx/dts/ipq5332-edgecore-eap105.dts
@@ -68,7 +68,6 @@
 						port_id = <1>;
 						phy_address = <2>;
 						mdiobus = <&mdio>;
-						ethernet-phy-ieee802.3-c45;
 					};
 					port@1 {
 						port_id = <2>;
diff --git a/feeds/qca/qca-nss-dp-qca/patches/100-phy_toggle_workaround.patch b/feeds/qca/qca-nss-dp-qca/patches/100-phy_toggle_workaround.patch
new file mode 100644
index 000000000..36914fe0b
--- /dev/null
+++ b/feeds/qca/qca-nss-dp-qca/patches/100-phy_toggle_workaround.patch
@@ -0,0 +1,35 @@
+--- a/nss_dp_main.c
++++ b/nss_dp_main.c
+@@ -295,8 +295,6 @@ static int nss_dp_close(struct net_devic
+ 		return -EAGAIN;
+ 	}
+ 
+-	if (dp_priv->phydev)
+-		phy_stop(dp_priv->phydev);
+ 	dp_priv->link_state = __NSS_DP_LINK_DOWN;
+ 
+ #if defined(NSS_DP_PPE_SUPPORT)
+@@ -434,7 +432,12 @@ static int nss_dp_open(struct net_device
+ 		netif_carrier_on(netdev);
+ 	} else {
+ 		dp_priv->link_state = __NSS_DP_LINK_DOWN;
+-		phy_start(dp_priv->phydev);
++		if (phy_is_started(dp_priv->phydev)) {
++			dp_priv->phydev->state = PHY_UP;
++			phy_trigger_machine(dp_priv->phydev);
++		} else {
++			phy_start(dp_priv->phydev);
++		}
+ 		phy_start_aneg(dp_priv->phydev);
+ 	}
+ 
+@@ -1024,6 +1027,9 @@ static int nss_dp_remove(struct platform
+ 		dp_ops = dp_priv->data_plane_ops;
+ 		hal_ops = dp_priv->gmac_hal_ops;
+ 
++		if (phy_is_started(dp_priv->phydev))
++			phy_stop(dp_priv->phydev);
++
+ 		if (dp_priv->phydev)
+ 			phy_disconnect(dp_priv->phydev);
+ 
diff --git a/profiles/cig_wf189-12_4.yml b/profiles/cig_wf189-12_4.yml
deleted file mode 100644
index 0dc5a3b8d..000000000
--- a/profiles/cig_wf189-12_4.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-profile: cig_wf189
-target: ipq53xx
-subtarget: generic
-description: Build image for the CIG WF189
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189-squashfs-sysupgrade.tar
-feeds:
-  - name: qca
-    path: ../../feeds/qca
-packages:
-  - ipq53xx
-  - ftm
diff --git a/profiles/cig_wf189.yml b/profiles/cig_wf189.yml
index 5aad71c90..a3b59fd1a 100644
--- a/profiles/cig_wf189.yml
+++ b/profiles/cig_wf189.yml
@@ -5,12 +5,10 @@ subtarget: generic
 description: Build image for the CIG WF189
 image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189-squashfs-sysupgrade.tar
 feeds:
-  - name: ipq95xx
-    path: ../../feeds/ipq95xx
+  - name: qca
+    path: ../../feeds/qca
+include:
+  - ucentral-ap
 packages:
   - ipq53xx
   - ftm
-include:
-  - ucentral-ap
-diffconfig: |
-  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
diff --git a/profiles/edgecore_eap105-12_4.yml b/profiles/edgecore_eap105-12_4.yml
deleted file mode 100644
index 2ae62d1c8..000000000
--- a/profiles/edgecore_eap105-12_4.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-profile: edgecore_eap105
-target: ipq53xx
-subtarget: generic
-description: Build image for the edgecore eap105
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-edgecore_eap105-squashfs-sysupgrade.tar
-feeds:
-  - name: qca
-    path: ../../feeds/qca
-include:
-  - ucentral-ap
-packages:
-  - ipq53xx
-  - qca-ssdk-shell
diff --git a/profiles/edgecore_eap105.yml b/profiles/edgecore_eap105.yml
index 229f74e94..2ae62d1c8 100644
--- a/profiles/edgecore_eap105.yml
+++ b/profiles/edgecore_eap105.yml
@@ -5,12 +5,10 @@ subtarget: generic
 description: Build image for the edgecore eap105
 image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-edgecore_eap105-squashfs-sysupgrade.tar
 feeds:
-  - name: ipq95xx
-    path: ../../feeds/ipq95xx
+  - name: qca
+    path: ../../feeds/qca
+include:
+  - ucentral-ap
 packages:
   - ipq53xx
   - qca-ssdk-shell
-include:
-  - ucentral-ap
-diffconfig: |
-  CONFIG_KERNEL_IPQ_MEM_PROFILE=0