diff --git a/feeds/ipq95xx/ipq53xx/base-files/etc/board.d/02_network b/feeds/ipq95xx/ipq53xx/base-files/etc/board.d/02_network
index b9ae14402..407af5e0d 100755
--- a/feeds/ipq95xx/ipq53xx/base-files/etc/board.d/02_network
+++ b/feeds/ipq95xx/ipq53xx/base-files/etc/board.d/02_network
@@ -30,13 +30,10 @@ qcom_setup_macs()
         cig,wf189)
                 mtd=$(find_mtd_chardev "0:APPSBLENV")
                 [ -z "$mtd" ] && return;
-                mac=$(grep BaseMacAddress= $mtd | cut -dx -f2)
-                [ -z "$mac" ] && return;
-                wan_mac=$(macaddr_canonicalize $mac)
-                lan_mac=$(macaddr_add "$wan_mac" 1)
-                ucidef_set_network_device_mac eth0 $lan_mac
-                ucidef_set_network_device_mac eth1 $wan_mac
-                ucidef_set_label_macaddr $wan_mac
+                wan_mac=$(grep eth1addr= $mtd | cut -d= -f2)
+                [ -z "$wan_mac" ] && return;
+		lan_mac=$(macaddr_add "$wan_mac" 1)
+                 ucidef_set_label_macaddr $wan_mac
                 ;;
         edgecore,eap105)
                 wan_mac=$(cat /sys/class/net/eth0/address)
@@ -48,9 +45,6 @@ qcom_setup_macs()
                 lan_mac=$(macaddr_add "$wan_mac" 1)
                 ;;
         esac
-        [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
-        [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
-        [ -n "$wan_mac" ] && ucidef_set_label_macaddr "$wan_mac"
 }
 
 board_config_update