diff --git a/meta-amd/conf/machine/include/amd.inc b/meta-amd/conf/machine/include/amd.inc
new file mode 100644
index 0000000..78ca8f2
--- /dev/null
+++ b/meta-amd/conf/machine/include/amd.inc
@@ -0,0 +1,23 @@
+MACHINE_FEATURES += "\
+        obmc-bmc-state-mgmt \
+        obmc-chassis-state-mgmt \
+        obmc-host-state-mgmt \
+        obmc-phosphor-chassis-mgmt \
+        obmc-host-ipmi \
+        obmc-phosphor-fan-mgmt \
+        obmc-phosphor-flash-mgmt \
+        "
+
+VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
+VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control"
+VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control"
+VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors"
+
+PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-amd-apps"
+PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps"
+PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps"
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"
+PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
+PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps"
+
+OVERRIDES .= ":amd"
diff --git a/meta-amd/meta-daytonax/conf/machine/daytonax.conf b/meta-amd/meta-daytonax/conf/machine/daytonax.conf
index 7843aad..cd7af72 100644
--- a/meta-amd/meta-daytonax/conf/machine/daytonax.conf
+++ b/meta-amd/meta-daytonax/conf/machine/daytonax.conf
@@ -6,32 +6,10 @@
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
+require conf/machine/include/amd.inc
 
 SERIAL_CONSOLES = "115200;ttyS4"
 
 FLASH_SIZE = "32768"
 
-MACHINE_FEATURES += "\
-        obmc-bmc-state-mgmt \
-        obmc-chassis-state-mgmt \
-        obmc-host-state-mgmt \
-        obmc-phosphor-chassis-mgmt \
-        obmc-host-ipmi \
-        obmc-phosphor-fan-mgmt \
-        obmc-phosphor-flash-mgmt \
-        "
-
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
-VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control"
-VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control"
-VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors"
-
-PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-amd-apps"
-PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps"
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps"
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"
-PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps"
 PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "daytonax-led-manager-config-native"
-
-OVERRIDES .= ":amd"
diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf
index dd6ef51..d84e648 100644
--- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf
+++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf
@@ -1,4 +1,3 @@
-
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = "${KMACHINE}-bmc-amd-${MACHINE}.dtb"
 
@@ -7,34 +6,10 @@
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
+require conf/machine/include/amd.inc
 
 SERIAL_CONSOLES = "115200;ttyS4"
 
 FLASH_SIZE = "32768"
 
-MACHINE_FEATURES += "\
-        obmc-bmc-state-mgmt \
-        obmc-chassis-state-mgmt \
-        obmc-host-state-mgmt \
-        obmc-phosphor-chassis-mgmt \
-        obmc-host-ipmi \
-        obmc-phosphor-fan-mgmt \
-        obmc-phosphor-flash-mgmt \
-        "
-
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
-VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control"
-VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control"
-VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors"
-
-PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-amd-apps"
-PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps"
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps"
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"
-PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps"
 PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "ethanolx-led-manager-config-native"
-
-OVERRIDES .= ":amd"
-
-