diff --git a/conf/machine/include/intel.inc b/conf/machine/include/intel.inc
index db6b0c1..738d103 100644
--- a/conf/machine/include/intel.inc
+++ b/conf/machine/include/intel.inc
@@ -19,3 +19,5 @@
 PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
 PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
 #PREFERRED_PROVIDER_virtual/obmc-gpio-monitor ?= "phosphor-gpio-monitor"
+
+OVERRIDES .= ":intel"
diff --git a/meta-common/recipes-core/systemd/obmc-targets.bbappend b/meta-common/recipes-core/systemd/obmc-targets.bbappend
index 3fe1c3f..090b40e 100644
--- a/meta-common/recipes-core/systemd/obmc-targets.bbappend
+++ b/meta-common/recipes-core/systemd/obmc-targets.bbappend
@@ -1,9 +1,9 @@
 # Remove these files since they are provided by obmc-intel-targets
-SYSTEMD_SERVICE_${PN}_remove += " obmc-host-start@.target"
-SYSTEMD_SERVICE_${PN}_remove += " obmc-host-stop@.target"
-SYSTEMD_SERVICE_${PN}_remove += " obmc-host-reboot@.target"
-SYSTEMD_SERVICE_${PN}_remove += " obmc-host-startmin@.target"
-SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-poweron@.target"
-SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-poweroff@.target"
-SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-hard-poweroff@.target"
-SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-powerreset@.target"
+SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-start@.target"
+SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-stop@.target"
+SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-reboot@.target"
+SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-startmin@.target"
+SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-poweron@.target"
+SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-poweroff@.target"
+SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-hard-poweroff@.target"
+SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-powerreset@.target"
diff --git a/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
index 4355318..ef991a5 100644
--- a/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
+++ b/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
@@ -1 +1 @@
-PHOSPHOR_MAPPER_CONFIGS_append = " intel-dbus-interfaces-mapper-config-native"
+PHOSPHOR_MAPPER_CONFIGS_append_intel = " intel-dbus-interfaces-mapper-config-native"
diff --git a/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 3e89746..4521fe8 100644
--- a/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_intel := "${THISDIR}/${PN}:"
 
 inherit obmc-phosphor-systemd
-SYSTEMD_SERVICE_${PN} = "phosphor-pid-control.service"
-EXTRA_OECONF = "--enable-configure-dbus=yes"
+SYSTEMD_SERVICE_${PN}_intel = "phosphor-pid-control.service"
+EXTRA_OECONF_intel = "--enable-configure-dbus=yes"
diff --git a/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index e5f63fb..876567f 100644
--- a/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,4 +1,4 @@
-do_install_append(){
+do_install_append_intel(){
   install -d ${D}${includedir}/phosphor-ipmi-host
   install -m 0644 -D ${S}/sensorhandler.hpp ${D}${includedir}/phosphor-ipmi-host
   install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host
diff --git a/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
index 4be8ddb..3e769e1 100644
--- a/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
+++ b/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
@@ -1,2 +1,2 @@
 # Enable threshold monitoring
-EXTRA_OECMAKE += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON"
+EXTRA_OECMAKE_intel += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON"
diff --git a/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
index ff1bfdb..590e9e6 100644
--- a/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
+++ b/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_intel := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " file://config.json"
+SRC_URI_append_intel = " file://config.json"
 
-do_compile_prepend() {
+do_compile_prepend_intel() {
         cp -r ${WORKDIR}/config.json ${S}/
 }