diff --git a/conf/machine/armada-385-nrhw18.conf b/conf/machine/armada-385-nrhw18.conf
index 6aeabc8..60810ad 100644
--- a/conf/machine/armada-385-nrhw18.conf
+++ b/conf/machine/armada-385-nrhw18.conf
@@ -7,9 +7,7 @@ require conf/machine/include/armada.inc
 SERIAL_CONSOLE = "115200 ttyS1"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
 
-KERNEL_DEFCONFIG ??= "armada-385-nrhw18_defconfig"
-KERNEL_DEVICETREE = "armada-385-nrhw18-prod1.dtb"
-KERNEL_IMAGETYPE = "zImage"
+KERNEL_DEVICETREE_TO_USE = "${HW18_DT}"
 
 KERNEL_MODULE_PROBECONF += "ath10k_pci"
 module_conf_ath10k_pci = "options ath10k_pci irq_mode=1"
diff --git a/conf/machine/include/armada.inc b/conf/machine/include/armada.inc
index 48ba26f..691e0b4 100644
--- a/conf/machine/include/armada.inc
+++ b/conf/machine/include/armada.inc
@@ -1,5 +1,6 @@
 SOC_FAMILY = "armada"
 require conf/machine/include/soc-family.inc
+require netmodule-hardware.inc
 
 DEFAULTTUNE ?= "cortexa9thf-neon"
 require conf/machine/include/tune-cortexa9.inc
@@ -8,8 +9,6 @@ require conf/machine/include/tune-cortexa9.inc
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 PREFERRED_PROVIDER_u-boot = "u-boot"
 
-KERNEL_IMAGETYPE = "zImage"
-
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "mvebu_db_armada8k_config"
 
@@ -24,3 +23,11 @@ SOTA_MACHINE = "armada-385"
 NM_TARGET = "netbolt"
 NM_ARCH = "arm"
 MACHINEOVERRIDES =. "${NM_TARGET}:"
+
+# We have one kernel for all armada machines
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_DEFCONFIG = "armada-385-netmodule_defconfig"
+
+HW18_DT = "armada-385-nrhw18-prod1.dtb"
+
+KERNEL_DEVICETREE = "${HW18_DT}"