diff --git a/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc
new file mode 100644
index 0000000..06d868f
--- /dev/null
+++ b/meta-openbmc-bsp/meta-aspeed/conf/machine/include/aspeed.inc
@@ -0,0 +1,10 @@
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
+
+ASPEED_UBOOT_VERSION ?= "v2016.07+git%"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
+PREFERRED_VERSION_u-boot ?= "${ASPEED_UBOOT_VERSION}"
+PREFERRED_VERSION_u-boot-fw-utils ?= "${ASPEED_UBOOT_VERSION}"
+
+MACHINEOVERRIDES .= ":aspeed"
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
index 49c6c23..2237475 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
@@ -2,9 +2,7 @@
 #@NAME: Aspeed AST2400
 #@DESCRIPTION: Common machine configuration for the Aspeed AST2400 Chip
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
-PREFERRED_VERSION_u-boot ?= "v2016.07+git%"
-PREFERRED_VERSION_u-boot-fw-utils ?= "v2016.07+git%"
+require conf/machine/include/aspeed.inc
 
 UBOOT_MACHINE ?= "ast_g4_ncsi_config"
 UBOOT_ENTRYPOINT ?= "0x40001000"
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
index be75332..fe079ee 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
@@ -2,7 +2,7 @@
 #@NAME: Aspeed AST2500
 #@DESCRIPTION: Common machine configuration for the Aspeed AST2500 Chip
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
+require conf/machine/include/aspeed.inc
 
 UBOOT_MACHINE ?= "ast_g5_ncsi_config"
 UBOOT_ENTRYPOINT ?= "0x80001000"