diff --git a/conf/machine/am335x-hw25.conf b/conf/machine/am335x-hw25.conf
index 4307cd2..7152ee3 100644
--- a/conf/machine/am335x-hw25.conf
+++ b/conf/machine/am335x-hw25.conf
@@ -10,6 +10,7 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-hw25"
 KERNEL_DEVICETREE = "am335x-hw25.dtb "
 
 SERIAL_CONSOLES = "115200;ttyS0"
+DEFAULT_ETH = "lan0"
 
 MACHINE_FEATURES_remove = " \
     bluetooth \
diff --git a/conf/machine/armada-385-nrhw18.conf b/conf/machine/armada-385-nrhw18.conf
index 2b74a9a..c2e6e0f 100644
--- a/conf/machine/armada-385-nrhw18.conf
+++ b/conf/machine/armada-385-nrhw18.conf
@@ -17,6 +17,8 @@ module_conf_ath10k_pci = "options ath10k_pci irq_mode=1"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada-385-nrhw18-v2"
 IMAGE_BOOT_FILES = "u-boot-armada-385-nrhw18-v2.kwb"
 
+DEFAULT_ETH = "eth2"
+
 MACHINE_FEATURES += " \
     fpga \
     atsha \
diff --git a/recipes-connectivity/networkmanager/networkmanager-conf.bb b/recipes-connectivity/networkmanager/networkmanager-conf.bb
index 80b879b..03a790b 100644
--- a/recipes-connectivity/networkmanager/networkmanager-conf.bb
+++ b/recipes-connectivity/networkmanager/networkmanager-conf.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Proprietary;md
 RDEPENDS_${PN} = "networkmanager"
 PACKAGECONFIG ?= ""
 
+DEFAULT_ETH ??= "eth0"
 PACKAGECONFIG[unmanaged-devices] = ""
 PACKAGECONFIG[ethernet-dhcp] = ""
 
@@ -36,6 +37,13 @@ do_install () {
         install -m 0600 ${WORKDIR}/eth0-static ${D}${sysconfdir}/NetworkManager/system-connections/eth0.nmconnection
     fi
 
+    # Handle HWs with different default interface
+    if [ "${DEFAULT_ETH}" != "eth0" ]; then
+        sed -i 's/eth0/${DEFAULT_ETH}/g' ${D}${sysconfdir}/NetworkManager/system-connections/*
+        mv ${D}${sysconfdir}/NetworkManager/system-connections/eth0.nmconnection \
+          ${D}${sysconfdir}/NetworkManager/system-connections/${DEFAULT_ETH}.nmconnection
+    fi
+
 
     if ${@bb.utils.contains('PACKAGECONFIG','unmanaged-devices','true','false',d)}; then
         install -d ${D}${sysconfdir}/NetworkManager/conf.d
@@ -52,11 +60,6 @@ do_install_append_am335x-nrhw20() {
     fi
 }
 
-do_install_append_armada-385-nrhw18() {
-    sed -i 's/eth0/eth2/g' ${D}${sysconfdir}/NetworkManager/system-connections/*
-	mv ${D}${sysconfdir}/NetworkManager/system-connections/eth0.nmconnection \
-	   ${D}${sysconfdir}/NetworkManager/system-connections/eth2.nmconnection
-}
 
 FILES_${PN} = " \
     ${sysconfdir}/NetworkManager/NetworkManager.conf \