diff --git a/feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/02_network b/feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/02_network
index cf1de11b..d094d859 100755
--- a/feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/02_network
+++ b/feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/02_network
@@ -19,8 +19,8 @@ qcom_setup_interfaces()
  	edgecore,oap101-6e|\
 	edgecore,oap101e|\
 	edgecore,oap101e-6e)
-		ucidef_set_interface_lan "eth0"
-		ucidef_set_interface_wan "eth1"
+		ucidef_set_interface_lan "eth1"
+		ucidef_set_interface_wan "eth0"
 		;;
 	edgecore,eap104)
 		ucidef_set_interface_wan "eth0"
diff --git a/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101-6e.dts b/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101-6e.dts
index 91017746..3878f131 100755
--- a/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101-6e.dts
+++ b/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101-6e.dts
@@ -388,13 +388,13 @@
 			compatible = "qcom,nss-dp";
 			clocks = <&gcc GCC_SNOC_GMAC0_AXI_CLK>;
 			clock-names = "nss-snoc-gmac-axi-clk";
-			qcom,id = <1>;
-			reg = <0x39C00000 0x10000>;
+			qcom,id = <2>;
+			reg = <0x39D00000 0x10000>;
 			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
 			qcom,mactype = <2>;
 			qcom,link-poll = <1>;
-			qcom,phy-mdio-addr = <7>;
-			mdio-bus = <&mdio0>;
+			qcom,phy-mdio-addr = <28>;
+			mdio-bus = <&mdio1>;
 			local-mac-address = [000000000000];
 			phy-mode = "sgmii";
 			qcom,rx-page-mode = <0>;
@@ -405,13 +405,13 @@
 			compatible = "qcom,nss-dp";
 			clocks = <&gcc GCC_SNOC_GMAC1_AXI_CLK>;
 			clock-names = "nss-snoc-gmac-axi-clk";
-			qcom,id = <2>;
-			reg = <0x39D00000 0x10000>;
+			qcom,id = <1>;
+			reg = <0x39C00000 0x10000>;
 			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
 			qcom,mactype = <2>;
 			qcom,link-poll = <1>;
-			qcom,phy-mdio-addr = <28>;
-			mdio-bus = <&mdio1>;
+			qcom,phy-mdio-addr = <7>;
+			mdio-bus = <&mdio0>;
 			local-mac-address = [000000000000];
 			phy-mode = "sgmii";
 			qcom,rx-page-mode = <0>;
diff --git a/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101.dts b/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101.dts
index fcd82763..e9c383b2 100755
--- a/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101.dts
+++ b/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101.dts
@@ -388,13 +388,13 @@
 			compatible = "qcom,nss-dp";
 			clocks = <&gcc GCC_SNOC_GMAC0_AXI_CLK>;
 			clock-names = "nss-snoc-gmac-axi-clk";
-			qcom,id = <1>;
-			reg = <0x39C00000 0x10000>;
+			qcom,id = <2>;
+			reg = <0x39D00000 0x10000>;
 			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
 			qcom,mactype = <2>;
 			qcom,link-poll = <1>;
-			qcom,phy-mdio-addr = <7>;
-			mdio-bus = <&mdio0>;
+			qcom,phy-mdio-addr = <28>;
+			mdio-bus = <&mdio1>;
 			local-mac-address = [000000000000];
 			phy-mode = "sgmii";
 			qcom,rx-page-mode = <0>;
@@ -405,13 +405,13 @@
 			compatible = "qcom,nss-dp";
 			clocks = <&gcc GCC_SNOC_GMAC1_AXI_CLK>;
 			clock-names = "nss-snoc-gmac-axi-clk";
-			qcom,id = <2>;
-			reg = <0x39D00000 0x10000>;
+			qcom,id = <1>;
+			reg = <0x39C00000 0x10000>;
 			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
 			qcom,mactype = <2>;
 			qcom,link-poll = <1>;
-			qcom,phy-mdio-addr = <28>;
-			mdio-bus = <&mdio1>;
+			qcom,phy-mdio-addr = <7>;
+			mdio-bus = <&mdio0>;
 			local-mac-address = [000000000000];
 			phy-mode = "sgmii";
 			qcom,rx-page-mode = <0>;
diff --git a/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101e-6e.dts b/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101e-6e.dts
index 6f6847da..818eaada 100755
--- a/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101e-6e.dts
+++ b/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101e-6e.dts
@@ -388,13 +388,13 @@
 			compatible = "qcom,nss-dp";
 			clocks = <&gcc GCC_SNOC_GMAC0_AXI_CLK>;
 			clock-names = "nss-snoc-gmac-axi-clk";
-			qcom,id = <1>;
-			reg = <0x39C00000 0x10000>;
+			qcom,id = <2>;
+			reg = <0x39D00000 0x10000>;
 			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
 			qcom,mactype = <2>;
 			qcom,link-poll = <1>;
-			qcom,phy-mdio-addr = <7>;
-			mdio-bus = <&mdio0>;
+			qcom,phy-mdio-addr = <28>;
+			mdio-bus = <&mdio1>;
 			local-mac-address = [000000000000];
 			phy-mode = "sgmii";
 			qcom,rx-page-mode = <0>;
@@ -405,13 +405,13 @@
 			compatible = "qcom,nss-dp";
 			clocks = <&gcc GCC_SNOC_GMAC1_AXI_CLK>;
 			clock-names = "nss-snoc-gmac-axi-clk";
-			qcom,id = <2>;
-			reg = <0x39D00000 0x10000>;
+			qcom,id = <1>;
+			reg = <0x39C00000 0x10000>;
 			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
 			qcom,mactype = <2>;
 			qcom,link-poll = <1>;
-			qcom,phy-mdio-addr = <28>;
-			mdio-bus = <&mdio1>;
+			qcom,phy-mdio-addr = <7>;
+			mdio-bus = <&mdio0>;
 			local-mac-address = [000000000000];
 			phy-mode = "sgmii";
 			qcom,rx-page-mode = <0>;
diff --git a/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101e.dts b/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101e.dts
index a39ea638..58b4f412 100755
--- a/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101e.dts
+++ b/feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-oap101e.dts
@@ -388,13 +388,13 @@
 			compatible = "qcom,nss-dp";
 			clocks = <&gcc GCC_SNOC_GMAC0_AXI_CLK>;
 			clock-names = "nss-snoc-gmac-axi-clk";
-			qcom,id = <1>;
-			reg = <0x39C00000 0x10000>;
+			qcom,id = <2>;
+			reg = <0x39D00000 0x10000>;
 			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
 			qcom,mactype = <2>;
 			qcom,link-poll = <1>;
-			qcom,phy-mdio-addr = <7>;
-			mdio-bus = <&mdio0>;
+			qcom,phy-mdio-addr = <28>;
+			mdio-bus = <&mdio1>;
 			local-mac-address = [000000000000];
 			phy-mode = "sgmii";
 			qcom,rx-page-mode = <0>;
@@ -405,13 +405,13 @@
 			compatible = "qcom,nss-dp";
 			clocks = <&gcc GCC_SNOC_GMAC1_AXI_CLK>;
 			clock-names = "nss-snoc-gmac-axi-clk";
-			qcom,id = <2>;
-			reg = <0x39D00000 0x10000>;
+			qcom,id = <1>;
+			reg = <0x39C00000 0x10000>;
 			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
 			qcom,mactype = <2>;
 			qcom,link-poll = <1>;
-			qcom,phy-mdio-addr = <28>;
-			mdio-bus = <&mdio1>;
+			qcom,phy-mdio-addr = <7>;
+			mdio-bus = <&mdio0>;
 			local-mac-address = [000000000000];
 			phy-mode = "sgmii";
 			qcom,rx-page-mode = <0>;