diff --git a/meta-common/recipes-core/systemd/obmc-targets.bbappend b/meta-common/recipes-core/systemd/obmc-targets.bbappend
new file mode 100644
index 0000000..3fe1c3f
--- /dev/null
+++ b/meta-common/recipes-core/systemd/obmc-targets.bbappend
@@ -0,0 +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"
diff --git a/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
index d69ea51..2490a5c 100644
--- a/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
+++ b/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
@@ -45,5 +45,6 @@
         bmcweb \
         entity-manager \
         intel-ipmi-oem \
+        dbus-sensors \
         phosphor-webui \
         "
diff --git a/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 6aa2460..6ad9a43 100644
--- a/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -3,4 +3,5 @@
   install -m 0644 -D ${S}/utils.hpp ${D}${includedir}/phosphor-ipmi-host
   install -m 0644 -D ${S}/types.hpp ${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/leds/intel-led-manager-config-native.bb b/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
new file mode 100644
index 0000000..8ef3a5d
--- /dev/null
+++ b/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Phosphor LED Group Management for Intel"
+PR = "r1"
+
+inherit native
+inherit obmc-phosphor-utils
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
+PROVIDES += "virtual/phosphor-led-manager-config-native"
+
+SRC_URI += "file://led.yaml"
+S = "${WORKDIR}"
+
+do_install() {
+    SRC=${S}
+    DEST=${D}${datadir}/phosphor-led-manager
+    install -D ${SRC}/led.yaml ${DEST}/led.yaml
+}
diff --git a/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml b/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
new file mode 100755
index 0000000..813ffbf
--- /dev/null
+++ b/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
@@ -0,0 +1,36 @@
+bmc_booted:
+
+power_on:
+
+status_ok:
+    status_green:
+        Action: 'On'
+    status_amber:
+        Action: 'Off'
+
+status_degraded:
+    status_green:
+        Action: 'Blink'
+        DutyOn: 50
+        Period: 1000
+    status_amber:
+        Action: 'Off'
+
+status_non_critical:
+    status_green:
+        Action: 'Off'
+    status_amber:
+        Action: 'Blink'
+        DutyOn: 50
+        Period: 1000
+
+status_critical:
+    status_green:
+        Action: 'Off'
+    status_amber:
+        Action: 'On'
+
+enclosure_identify:
+    identify:
+        Action: 'On'
+