diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/board-type-checker/board-type-checker.bb b/meta-facebook/meta-bletchley/recipes-bletchley/board-type-checker/board-type-checker.bb
index a75f6e7..2653616 100644
--- a/meta-facebook/meta-bletchley/recipes-bletchley/board-type-checker/board-type-checker.bb
+++ b/meta-facebook/meta-bletchley/recipes-bletchley/board-type-checker/board-type-checker.bb
@@ -17,5 +17,5 @@
 
 do_install() {
     install -d ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/board-type-checker-fpb ${D}${libexecdir}/
+    install -m 0755 ${UNPACKDIR}/board-type-checker-fpb ${D}${libexecdir}/
 }
diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/detect-gpio-present/detect-sled-present_0.1.bb b/meta-facebook/meta-bletchley/recipes-bletchley/detect-gpio-present/detect-sled-present_0.1.bb
index cfcebdc..3b61d84 100644
--- a/meta-facebook/meta-bletchley/recipes-bletchley/detect-gpio-present/detect-sled-present_0.1.bb
+++ b/meta-facebook/meta-bletchley/recipes-bletchley/detect-gpio-present/detect-sled-present_0.1.bb
@@ -17,12 +17,12 @@
 
 do_install() {
     install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/detect-sled-present ${D}${bindir}/
+    install -m 0755 ${UNPACKDIR}/detect-sled-present ${D}${bindir}/
 
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/detect-sled-present@.service ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/bletchley-sled-insertion@.target ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/bletchley-sled-removal@.target ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/detect-sled-present@.service ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/bletchley-sled-insertion@.target ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/bletchley-sled-removal@.target ${D}${systemd_system_unitdir}
 }
 
 TGT = "${SYSTEMD_DEFAULT_TARGET}"
diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/fw-update/fw-update_0.1.bb b/meta-facebook/meta-bletchley/recipes-bletchley/fw-update/fw-update_0.1.bb
index 91fdc88..4c6b2af 100644
--- a/meta-facebook/meta-bletchley/recipes-bletchley/fw-update/fw-update_0.1.bb
+++ b/meta-facebook/meta-bletchley/recipes-bletchley/fw-update/fw-update_0.1.bb
@@ -8,14 +8,15 @@
 RDEPENDS:${PN} += "bash"
 RDEPENDS:${PN} += "libgpiod-tools"
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 SRC_URI += " \
     file://usb-controller-update \
 "
 
 do_install() {
         install -d ${D}${sbindir}
-        install -m 0755 ${WORKDIR}/usb-controller-update ${D}${sbindir}
+        install -m 0755 ${UNPACKDIR}/usb-controller-update ${D}${sbindir}
 }
 
 FLASH_USB_CONTROLLER_INSTFMT="flash-usb-controller@.service:flash-usb-controller@{0}.service"
diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/mdio-util/mdio-util_0.1.bb b/meta-facebook/meta-bletchley/recipes-bletchley/mdio-util/mdio-util_0.1.bb
index 9a619b4..dde9c4c 100644
--- a/meta-facebook/meta-bletchley/recipes-bletchley/mdio-util/mdio-util_0.1.bb
+++ b/meta-facebook/meta-bletchley/recipes-bletchley/mdio-util/mdio-util_0.1.bb
@@ -8,7 +8,8 @@
 SRC_URI += " \
         file://mdio-util \
 "
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 do_install() {
         install -d ${D}${sbindir}
diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb
index a0e85bd..484217d 100644
--- a/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb
+++ b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb
@@ -11,7 +11,8 @@
 RDEPENDS:${PN} += "mdio-tools"
 RDEPENDS:${PN} += "bletchley-common-functions"
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 SRC_URI += " \
     file://motor-ctrl \
     file://motor-init \
@@ -20,11 +21,11 @@
 
 do_install() {
         install -d ${D}${sbindir}
-        install -m 0755 ${WORKDIR}/power-ctrl ${D}${sbindir}
+        install -m 0755 ${UNPACKDIR}/power-ctrl ${D}${sbindir}
 
         install -d ${D}${libexecdir}
-        install -m 0755 ${WORKDIR}/motor-ctrl ${D}${libexecdir}
-        install -m 0755 ${WORKDIR}/motor-init ${D}${libexecdir}
+        install -m 0755 ${UNPACKDIR}/motor-ctrl ${D}${libexecdir}
+        install -m 0755 ${UNPACKDIR}/motor-init ${D}${libexecdir}
 }
 
 TGT = "${SYSTEMD_DEFAULT_TARGET}"
diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/plat-svc_0.1.bb b/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/plat-svc_0.1.bb
index b1508df..7638424 100644
--- a/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/plat-svc_0.1.bb
+++ b/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/plat-svc_0.1.bb
@@ -23,8 +23,8 @@
 
 do_install() {
     install -d ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/bletchley-early-sys-init ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/bletchley-host-state-monitor ${D}${libexecdir}
+    install -m 0755 ${UNPACKDIR}/bletchley-early-sys-init ${D}${libexecdir}
+    install -m 0755 ${UNPACKDIR}/bletchley-host-state-monitor ${D}${libexecdir}
 }
 
 SYSTEMD_OVERRIDE:${PN} += "bletchley-sys-init.conf:bletchley-sys-init.service.d/bletchley-sys-init.conf"
diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/plat-tools/bletchley-common-functions_0.1.bb b/meta-facebook/meta-bletchley/recipes-bletchley/plat-tools/bletchley-common-functions_0.1.bb
index 0581f23..74861e2 100644
--- a/meta-facebook/meta-bletchley/recipes-bletchley/plat-tools/bletchley-common-functions_0.1.bb
+++ b/meta-facebook/meta-bletchley/recipes-bletchley/plat-tools/bletchley-common-functions_0.1.bb
@@ -9,5 +9,5 @@
 
 do_install() {
     install -d ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/bletchley-common-functions ${D}${libexecdir}
+    install -m 0755 ${UNPACKDIR}/bletchley-common-functions ${D}${libexecdir}
 }
diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/plat-tools/bletchley-common-tool_0.1.bb b/meta-facebook/meta-bletchley/recipes-bletchley/plat-tools/bletchley-common-tool_0.1.bb
index afe3791..7c9faad 100644
--- a/meta-facebook/meta-bletchley/recipes-bletchley/plat-tools/bletchley-common-tool_0.1.bb
+++ b/meta-facebook/meta-bletchley/recipes-bletchley/plat-tools/bletchley-common-tool_0.1.bb
@@ -15,11 +15,11 @@
 
 do_install() {
     install -d ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/bletchley-system-state-init ${D}${libexecdir}
+    install -m 0755 ${UNPACKDIR}/bletchley-system-state-init ${D}${libexecdir}
 
     install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/bletchley-usbmux-util ${D}${bindir}
-    install -m 0755 ${WORKDIR}/bletchley-net-util ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/bletchley-usbmux-util ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/bletchley-net-util ${D}${bindir}
 }
 
 
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
index 91e994e..cb74581 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
@@ -4,7 +4,7 @@
 
 do_install:append() {
         install -d ${D}${sysconfdir}/default/obmc/gpio/
-        install -m 0644 ${WORKDIR}/gpio_defs.json ${D}/${sysconfdir}/default/obmc/gpio/
+        install -m 0644 ${UNPACKDIR}/gpio_defs.json ${D}/${sysconfdir}/default/obmc/gpio/
 }
 
 FILES:${PN}-signals:append = " ${sysconfdir}/default/obmc/gpio/gpio_defs.json"
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/configuration/bletchley-yaml-config.bb b/meta-facebook/meta-bletchley/recipes-phosphor/configuration/bletchley-yaml-config.bb
index 7a8f847..0350a5c 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/configuration/bletchley-yaml-config.bb
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/configuration/bletchley-yaml-config.bb
@@ -9,7 +9,8 @@
     file://bletchley-ipmi-fru.yaml \
     "
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 do_install() {
     install -m 0644 -D bletchley-ipmi-fru.yaml \
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config-native.bb b/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config-native.bb
index d06ec86..769c209 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config-native.bb
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config-native.bb
@@ -8,7 +8,8 @@
 PROVIDES += "virtual/phosphor-led-manager-config-native"
 
 SRC_URI += "file://led.yaml"
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 # Copies example led layout yaml file
 do_install() {
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network_%.bbappend
index 5950888..ce0cb63 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -11,5 +11,5 @@
 
 do_install:append() {
     install -d ${D}${datadir}/network/
-    install -m 0644 ${WORKDIR}/config.json ${D}${datadir}/network/
+    install -m 0644 ${UNPACKDIR}/config.json ${D}${datadir}/network/
 }
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
index c550d59..8aa1e9d 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
@@ -12,10 +12,10 @@
 
 do_install:append() {
         install -d ${D}${libexecdir}/${PN}/
-        install -m 0755 ${WORKDIR}/nvme-json-rewrite ${D}${libexecdir}/${PN}/
+        install -m 0755 ${UNPACKDIR}/nvme-json-rewrite ${D}${libexecdir}/${PN}/
 
         install -d ${D}${sysconfdir}/nvme
-        install -m 0644 -D ${WORKDIR}/nvme_config.json ${D}${sysconfdir}/nvme
+        install -m 0644 -D ${UNPACKDIR}/nvme_config.json ${D}${sysconfdir}/nvme
 }
 
 SYSTEMD_OVERRIDE:${PN}:append = " \
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index ab4a245..82e1c48 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -14,10 +14,10 @@
 
 do_install:append() {
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/*.service ${D}${systemd_system_unitdir}/
 
     install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
 }
 
 FILES:${PN}:append= " ${systemd_system_unitdir}"
diff --git a/meta-facebook/meta-greatlakes/recipes-greatlakes/greatlakes-sysinit/greatlakes-sysinit.bb b/meta-facebook/meta-greatlakes/recipes-greatlakes/greatlakes-sysinit/greatlakes-sysinit.bb
index 716251e..3cdad05 100644
--- a/meta-facebook/meta-greatlakes/recipes-greatlakes/greatlakes-sysinit/greatlakes-sysinit.bb
+++ b/meta-facebook/meta-greatlakes/recipes-greatlakes/greatlakes-sysinit/greatlakes-sysinit.bb
@@ -16,7 +16,7 @@
 
 do_install() {
     install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/greatlakes-system-state-init ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/greatlakes-system-state-init ${D}${libexecdir}/${PN}/
 }
 
 TGT = "${SYSTEMD_DEFAULT_TARGET}"
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/meta-greatlakes/recipes-phosphor/console/obmc-console_%.bbappend
index dc06c80..0fe1ca6 100644
--- a/meta-facebook/meta-greatlakes/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/console/obmc-console_%.bbappend
@@ -3,5 +3,5 @@
 SRC_URI:append = " file://select-uart-mux"
 
 do_install:append() {
-        install -m 0744 ${WORKDIR}/select-uart-mux ${D}${bindir}
+        install -m 0744 ${UNPACKDIR}/select-uart-mux ${D}${bindir}
 }
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-greatlakes/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 18e5627..e3e2d6a 100644
--- a/meta-facebook/meta-greatlakes/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -6,5 +6,5 @@
 
 do_install:append() {
     install -d ${D}${datadir}/swampd
-    install -m 0644 -D ${WORKDIR}/config.json ${D}${datadir}/swampd/
+    install -m 0644 -D ${UNPACKDIR}/config.json ${D}${datadir}/swampd/
 }
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/gpio/greatlakes-gpio-monitor-register.bb b/meta-facebook/meta-greatlakes/recipes-phosphor/gpio/greatlakes-gpio-monitor-register.bb
index 6a98f27..44d2e66 100644
--- a/meta-facebook/meta-greatlakes/recipes-phosphor/gpio/greatlakes-gpio-monitor-register.bb
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/gpio/greatlakes-gpio-monitor-register.bb
@@ -4,7 +4,8 @@
 PR = "r1"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit obmc-phosphor-systemd
 
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-greatlakes/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index eb7f9fc..57a0ae7 100644
--- a/meta-facebook/meta-greatlakes/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -4,6 +4,6 @@
 
 do_install:append:() {
     install -d ${D}${datadir}/phosphor-gpio-monitor
-    install -m 0644 ${WORKDIR}/greatlakes-phosphor-multi-gpio-monitor.json \
+    install -m 0644 ${UNPACKDIR}/greatlakes-phosphor-multi-gpio-monitor.json \
                     ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json
 }
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 9f116af..5381848 100644
--- a/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -29,18 +29,18 @@
 
 do_install:append () {
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/*.service ${D}${systemd_system_unitdir}/
 
     install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/chassis-poweroff ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/chassis-poweron ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-poweroff ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-poweron ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-powercycle ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-powerreset ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/power-cmd ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/power-ctrl-init ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/chassis-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/chassis-poweron ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-poweron ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-powerreset ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/power-cmd ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/power-ctrl-init ${D}${libexecdir}/${PN}/
 }
 
 SYSTEMD_SERVICE:${PN}-bmc:append = "power-ctrl-init.service"
diff --git a/meta-facebook/meta-harma/recipes-networking/mctp/mctp_%.bbappend b/meta-facebook/meta-harma/recipes-networking/mctp/mctp_%.bbappend
index c33d4da..48a1804 100644
--- a/meta-facebook/meta-harma/recipes-networking/mctp/mctp_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-networking/mctp/mctp_%.bbappend
@@ -14,13 +14,13 @@
     override_dir=${D}${systemd_system_unitdir}/mctpd.service.d
     install -d ${D}${systemd_system_unitdir}/mctpd.service.d
 
-    install -m 0644 ${WORKDIR}/setup-eid.conf \
+    install -m 0644 ${UNPACKDIR}/setup-eid.conf \
               ${override_dir}/setup-eid.conf
 
     install -d ${D}${libexecdir}/mctp
 
-    install -m 0755 ${WORKDIR}/setup-local-eid \
+    install -m 0755 ${UNPACKDIR}/setup-local-eid \
               ${D}${libexecdir}/mctp/
-    install -m 0755 ${WORKDIR}/setup-bic-eid \
+    install -m 0755 ${UNPACKDIR}/setup-bic-eid \
               ${D}${libexecdir}/mctp/
 }
diff --git a/meta-facebook/meta-harma/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
index 91e994e..cb74581 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
@@ -4,7 +4,7 @@
 
 do_install:append() {
         install -d ${D}${sysconfdir}/default/obmc/gpio/
-        install -m 0644 ${WORKDIR}/gpio_defs.json ${D}/${sysconfdir}/default/obmc/gpio/
+        install -m 0644 ${UNPACKDIR}/gpio_defs.json ${D}/${sysconfdir}/default/obmc/gpio/
 }
 
 FILES:${PN}-signals:append = " ${sysconfdir}/default/obmc/gpio/gpio_defs.json"
diff --git a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend
index 23e7ed4..55b50f8 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -12,8 +12,8 @@
 SYSTEMD_OVERRIDE:${PN} += "xyz.openbmc_project.EntityManager.conf:xyz.openbmc_project.EntityManager.service.d/xyz.openbmc_project.EntityManager.conf"
 
 do_install:append() {
-    install -m 0644 -D ${WORKDIR}/blacklist.json ${D}${datadir}/${PN}/blacklist.json
+    install -m 0644 -D ${UNPACKDIR}/blacklist.json ${D}${datadir}/${PN}/blacklist.json
 
     install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/device-driver-probe ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/device-driver-probe ${D}${libexecdir}/${PN}/
 }
diff --git a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console_%.bbappend
index 3d59428..7a39d19 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console_%.bbappend
@@ -14,5 +14,5 @@
 
 do_install:append() {
         install -d ${D}${base_libdir}/udev/rules.d/
-        install -m 0644 ${WORKDIR}/plat-80-obmc-console-uart.rules ${D}${base_libdir}/udev/rules.d/80-obmc-console-uart.rules
+        install -m 0644 ${UNPACKDIR}/plat-80-obmc-console-uart.rules ${D}${base_libdir}/udev/rules.d/80-obmc-console-uart.rules
 }
diff --git a/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 56632d8..3ee8ef2 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -6,5 +6,5 @@
 
 do_install:append() {
     install -d ${D}${datadir}/swampd
-    install -m 0644 -D ${WORKDIR}/config.json ${D}${datadir}/swampd/config.json
+    install -m 0644 -D ${UNPACKDIR}/config.json ${D}${datadir}/swampd/config.json
 }
diff --git a/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
index 6dd496f..1c53e38 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
@@ -6,5 +6,5 @@
 
 do_install:append() {
     install -d ${D}/${sbindir}
-    install -m 0755 ${WORKDIR}/bios-update ${D}/${sbindir}/
+    install -m 0755 ${UNPACKDIR}/bios-update ${D}/${sbindir}/
 }
diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 6787b88..bfdf8ee 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -51,31 +51,31 @@
     install -d ${D}${systemd_system_unitdir}/
     install -d ${D}${libexecdir}/${PN}
 
-    install -m 0644 ${WORKDIR}/plat-phosphor-multi-gpio-monitor.json \
+    install -m 0644 ${UNPACKDIR}/plat-phosphor-multi-gpio-monitor.json \
                     ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json
-    install -m 0644 ${WORKDIR}/plat-phosphor-multi-gpio-presence.json \
+    install -m 0644 ${UNPACKDIR}/plat-phosphor-multi-gpio-presence.json \
                     ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-presence.json
 
     install -d ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/*.service ${D}${systemd_system_unitdir}/
 
     install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/logging ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/multi-gpios-sys-init ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/logging ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/multi-gpios-sys-init ${D}${libexecdir}/${PN}/
 
-    install -m 0755 ${WORKDIR}/assert-reset-button ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/deassert-reset-button ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/assert-reset-button ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/deassert-reset-button ${D}${libexecdir}/${PN}/
 
-    install -m 0755 ${WORKDIR}/assert-post-end ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/deassert-post-end ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/assert-post-end ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/deassert-post-end ${D}${libexecdir}/${PN}/
 
-    install -m 0755 ${WORKDIR}/assert-power-good ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/deassert-power-good ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/assert-power-good ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/deassert-power-good ${D}${libexecdir}/${PN}/
 
-    install -m 0755 ${WORKDIR}/deassert-uart-switch-button ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/deassert-uart-switch-button ${D}${libexecdir}/${PN}/
 
-    install -m 0755 ${WORKDIR}/host-power-off ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-power-on ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-power-off ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-power-on ${D}${libexecdir}/${PN}/
 }
 
 SYSTEMD_OVERRIDE:${PN}-monitor += "phosphor-multi-gpio-monitor.conf:phosphor-multi-gpio-monitor.service.d/phosphor-multi-gpio-monitor.conf"
diff --git a/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index 0aa1844..5bf613c 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -4,7 +4,7 @@
 SRC_URI:append = " file://led-group-config.json"
 
 do_install:append() {
-        install -m 0644 ${WORKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/
+        install -m 0644 ${UNPACKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/
 }
 
 # Harma power led is follows the host status.
diff --git a/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend
index 7eeaf22..6633ced 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -8,5 +8,5 @@
 
 do_install:append() {
     install -d ${D}${systemd_unitdir}/network/
-    install -m 0644 ${WORKDIR}/00-bmc-usb0.network ${D}${systemd_unitdir}/network/00-bmc-usb0.network
+    install -m 0644 ${UNPACKDIR}/00-bmc-usb0.network ${D}${systemd_unitdir}/network/00-bmc-usb0.network
 }
diff --git a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 71e445e..081779f 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -97,18 +97,18 @@
 
 do_install:append() {
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/*.service ${D}${systemd_system_unitdir}/
 
     install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/chassis-poweroff ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/chassis-poweron ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-force-poweroff ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-graceful-poweroff ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-poweron ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-powerreset ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/power-cmd ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/phosphor-state-manager-init ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/chassis-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/chassis-poweron ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-force-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-graceful-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-poweron ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-powerreset ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/power-cmd ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/phosphor-state-manager-init ${D}${libexecdir}/${PN}/
 }
 SYSTEMD_OVERRIDE:${PN}-discover += "discover-sys-init.conf:phosphor-discover-system-state@0.service.d/discover-sys-init.conf"
 SYSTEMD_OVERRIDE:${PN}-systemd-target-monitor += "phosphor-state-manager-init.conf:phosphor-systemd-target-monitor.service.d/phosphor-state-manager-init.conf"
diff --git a/meta-facebook/meta-minerva/recipes-minerva/plat-svc/plat-svc_0.1.bb b/meta-facebook/meta-minerva/recipes-minerva/plat-svc/plat-svc_0.1.bb
index c60b1f5..b44213b 100644
--- a/meta-facebook/meta-minerva/recipes-minerva/plat-svc/plat-svc_0.1.bb
+++ b/meta-facebook/meta-minerva/recipes-minerva/plat-svc/plat-svc_0.1.bb
@@ -22,7 +22,7 @@
 
 do_install() {
     install -d ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/minerva-early-sys-init ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/minerva-fan-status-monitor ${D}${libexecdir}
+    install -m 0755 ${UNPACKDIR}/minerva-early-sys-init ${D}${libexecdir}
+    install -m 0755 ${UNPACKDIR}/minerva-fan-status-monitor ${D}${libexecdir}
 }
 
diff --git a/meta-facebook/meta-minerva/recipes-minerva/plat-tool/minerva-common-functions_0.1.bb b/meta-facebook/meta-minerva/recipes-minerva/plat-tool/minerva-common-functions_0.1.bb
index 2f470be..6b07b10 100644
--- a/meta-facebook/meta-minerva/recipes-minerva/plat-tool/minerva-common-functions_0.1.bb
+++ b/meta-facebook/meta-minerva/recipes-minerva/plat-tool/minerva-common-functions_0.1.bb
@@ -9,5 +9,5 @@
 
 do_install() {
     install -d ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/minerva-common-functions ${D}${libexecdir}
+    install -m 0755 ${UNPACKDIR}/minerva-common-functions ${D}${libexecdir}
 }
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
index 91e994e..cb74581 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
@@ -4,7 +4,7 @@
 
 do_install:append() {
         install -d ${D}${sysconfdir}/default/obmc/gpio/
-        install -m 0644 ${WORKDIR}/gpio_defs.json ${D}/${sysconfdir}/default/obmc/gpio/
+        install -m 0644 ${UNPACKDIR}/gpio_defs.json ${D}/${sysconfdir}/default/obmc/gpio/
 }
 
 FILES:${PN}-signals:append = " ${sysconfdir}/default/obmc/gpio/gpio_defs.json"
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend
index 0d96922..b7901a9 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend
@@ -15,5 +15,5 @@
     # Replace upstream-provided udev rules
     install -d ${D}/${nonarch_base_libdir}/udev/rules.d
     rm -f ${D}/${nonarch_base_libdir}/udev/rules.d/80-obmc-console-uart.rules
-    install -m 0644 ${WORKDIR}/80-minerva-obmc-console-uart.rules ${D}/${nonarch_base_libdir}/udev/rules.d
+    install -m 0644 ${UNPACKDIR}/80-minerva-obmc-console-uart.rules ${D}/${nonarch_base_libdir}/udev/rules.d
 }
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index b8a12fc..b003c9b 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -30,16 +30,16 @@
 
 do_install:append:() {
     install -d ${D}${datadir}/phosphor-gpio-monitor
-    install -m 0644 ${WORKDIR}/minerva-phosphor-multi-gpio-monitor.json \
+    install -m 0644 ${UNPACKDIR}/minerva-phosphor-multi-gpio-monitor.json \
                     ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json
-    install -m 0644 ${WORKDIR}/minerva-phosphor-multi-gpio-presence.json \
+    install -m 0644 ${UNPACKDIR}/minerva-phosphor-multi-gpio-presence.json \
                     ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-presence.json
 
     for s in ${SERVICE_LIST}
     do
-        install -m 0644 ${WORKDIR}/${s} ${D}${systemd_system_unitdir}/${s}
+        install -m 0644 ${UNPACKDIR}/${s} ${D}${systemd_system_unitdir}/${s}
     done
 
     install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/logging ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/logging ${D}${libexecdir}/${PN}/
 }
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index 6b12a39..0b5545b 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -3,5 +3,5 @@
 SRC_URI:append = " file://led-group-config.json"
 
 do_install:append() {
-        install -m 0644 ${WORKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/
+        install -m 0644 ${UNPACKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/
 }
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/network/phosphor-network_%.bbappend
index 5950888..ce0cb63 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -11,5 +11,5 @@
 
 do_install:append() {
     install -d ${D}${datadir}/network/
-    install -m 0644 ${WORKDIR}/config.json ${D}${datadir}/network/
+    install -m 0644 ${UNPACKDIR}/config.json ${D}${datadir}/network/
 }
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 4ef3a95..42d3c20 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -17,8 +17,8 @@
 
 do_install:append:minerva() {
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/*.service ${D}${systemd_system_unitdir}/
 
     install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
 }
diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
index 6dd496f..1c53e38 100644
--- a/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
+++ b/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
@@ -6,5 +6,5 @@
 
 do_install:append() {
     install -d ${D}/${sbindir}
-    install -m 0755 ${WORKDIR}/bios-update ${D}/${sbindir}/
+    install -m 0755 ${UNPACKDIR}/bios-update ${D}/${sbindir}/
 }
diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
index a9019b0..5681d1a 100644
--- a/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
+++ b/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
@@ -4,5 +4,5 @@
 
 do_install:append() {
     install -d ${D}${sysconfdir}/nvme
-    install -m 0644 -D ${WORKDIR}/nvme_config.json ${D}/${sysconfdir}/nvme
+    install -m 0644 -D ${UNPACKDIR}/nvme_config.json ${D}/${sysconfdir}/nvme
 }
diff --git a/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/fb-powerctrl_0.1.bb b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/fb-powerctrl_0.1.bb
index 0af04f1..f63f8b4 100644
--- a/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/fb-powerctrl_0.1.bb
+++ b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/fb-powerctrl_0.1.bb
@@ -19,7 +19,8 @@
     host-poweroff.service \
     "
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 do_install() {
     install -d ${D}/usr/sbin
diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend b/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend
index 077f1b4..28605b3 100644
--- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend
@@ -14,17 +14,17 @@
     override_dir=${D}${systemd_system_unitdir}/mctpd.service.d
     install -d ${D}${systemd_system_unitdir}/mctpd.service.d
 
-    install -m 0644 ${WORKDIR}/setup-local-eid.conf \
+    install -m 0644 ${UNPACKDIR}/setup-local-eid.conf \
             ${override_dir}/setup-local-eid.conf
-    install -m 0644 ${WORKDIR}/setup-static-endpoints.conf \
+    install -m 0644 ${UNPACKDIR}/setup-static-endpoints.conf \
             ${override_dir}/setup-static-endpoints.conf
 
     install -d ${D}${libexecdir}/mctp
 
-    install -m 0755 ${WORKDIR}/mctp-config \
+    install -m 0755 ${UNPACKDIR}/mctp-config \
             ${D}${libexecdir}/mctp/
-    install -m 0755 ${WORKDIR}/setup-static-endpoints \
+    install -m 0755 ${UNPACKDIR}/setup-static-endpoints \
             ${D}${libexecdir}/mctp/
-    install -m 0755 ${WORKDIR}/nic-gpio-addrs \
+    install -m 0755 ${UNPACKDIR}/nic-gpio-addrs \
             ${D}${libexecdir}/mctp/
 }
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
index 91e994e..cb74581 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend
@@ -4,7 +4,7 @@
 
 do_install:append() {
         install -d ${D}${sysconfdir}/default/obmc/gpio/
-        install -m 0644 ${WORKDIR}/gpio_defs.json ${D}/${sysconfdir}/default/obmc/gpio/
+        install -m 0644 ${UNPACKDIR}/gpio_defs.json ${D}/${sysconfdir}/default/obmc/gpio/
 }
 
 FILES:${PN}-signals:append = " ${sysconfdir}/default/obmc/gpio/gpio_defs.json"
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led.bb b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led.bb
index 0758813..25c1d39 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led.bb
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led.bb
@@ -24,18 +24,18 @@
 "
 
 do_install() {
-    install -D ${WORKDIR}/board-0-fan-0.yaml ${D}${config_dir}/board-0-fan-0.yaml
-    install -D ${WORKDIR}/board-0-fan-1.yaml ${D}${config_dir}/board-0-fan-1.yaml
-    install -D ${WORKDIR}/board-0-fan-4.yaml ${D}${config_dir}/board-0-fan-4.yaml
-    install -D ${WORKDIR}/board-0-fan-5.yaml ${D}${config_dir}/board-0-fan-5.yaml
-    install -D ${WORKDIR}/board-0-fan-8.yaml ${D}${config_dir}/board-0-fan-8.yaml
-    install -D ${WORKDIR}/board-0-fan-9.yaml ${D}${config_dir}/board-0-fan-9.yaml
-    install -D ${WORKDIR}/board-1-fan-10.yaml ${D}${config_dir}/board-1-fan-10.yaml
-    install -D ${WORKDIR}/board-1-fan-11.yaml ${D}${config_dir}/board-1-fan-11.yaml
-    install -D ${WORKDIR}/board-1-fan-2.yaml ${D}${config_dir}/board-1-fan-2.yaml
-    install -D ${WORKDIR}/board-1-fan-3.yaml ${D}${config_dir}/board-1-fan-3.yaml
-    install -D ${WORKDIR}/board-1-fan-6.yaml ${D}${config_dir}/board-1-fan-6.yaml
-    install -D ${WORKDIR}/board-1-fan-7.yaml ${D}${config_dir}/board-1-fan-7.yaml
+    install -D ${UNPACKDIR}/board-0-fan-0.yaml ${D}${config_dir}/board-0-fan-0.yaml
+    install -D ${UNPACKDIR}/board-0-fan-1.yaml ${D}${config_dir}/board-0-fan-1.yaml
+    install -D ${UNPACKDIR}/board-0-fan-4.yaml ${D}${config_dir}/board-0-fan-4.yaml
+    install -D ${UNPACKDIR}/board-0-fan-5.yaml ${D}${config_dir}/board-0-fan-5.yaml
+    install -D ${UNPACKDIR}/board-0-fan-8.yaml ${D}${config_dir}/board-0-fan-8.yaml
+    install -D ${UNPACKDIR}/board-0-fan-9.yaml ${D}${config_dir}/board-0-fan-9.yaml
+    install -D ${UNPACKDIR}/board-1-fan-10.yaml ${D}${config_dir}/board-1-fan-10.yaml
+    install -D ${UNPACKDIR}/board-1-fan-11.yaml ${D}${config_dir}/board-1-fan-11.yaml
+    install -D ${UNPACKDIR}/board-1-fan-2.yaml ${D}${config_dir}/board-1-fan-2.yaml
+    install -D ${UNPACKDIR}/board-1-fan-3.yaml ${D}${config_dir}/board-1-fan-3.yaml
+    install -D ${UNPACKDIR}/board-1-fan-6.yaml ${D}${config_dir}/board-1-fan-6.yaml
+    install -D ${UNPACKDIR}/board-1-fan-7.yaml ${D}${config_dir}/board-1-fan-7.yaml
 }
 
 FILES:${PN}:append = " \
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/power-saving-policy.bb b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/power-saving-policy.bb
index 6855fe0..188eb86 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/power-saving-policy.bb
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/power-saving-policy.bb
@@ -16,10 +16,10 @@
 "
 
 do_install() {
-    install -D ${WORKDIR}/nic-1.yaml ${D}${config_dir}/nic-1.yaml
-    install -D ${WORKDIR}/nic-2.yaml ${D}${config_dir}/nic-2.yaml
-    install -D ${WORKDIR}/nic-3.yaml ${D}${config_dir}/nic-3.yaml
-    install -D ${WORKDIR}/nic-4.yaml ${D}${config_dir}/nic-4.yaml
+    install -D ${UNPACKDIR}/nic-1.yaml ${D}${config_dir}/nic-1.yaml
+    install -D ${UNPACKDIR}/nic-2.yaml ${D}${config_dir}/nic-2.yaml
+    install -D ${UNPACKDIR}/nic-3.yaml ${D}${config_dir}/nic-3.yaml
+    install -D ${UNPACKDIR}/nic-4.yaml ${D}${config_dir}/nic-4.yaml
 }
 
 FILES:${PN}:append = " \
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 949cbf8..c36eb3f 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -61,37 +61,37 @@
 
 do_install:append:() {
     install -d ${D}${datadir}/phosphor-gpio-monitor
-    install -m 0644 ${WORKDIR}/yosemite4-phosphor-multi-gpio-monitor.json \
+    install -m 0644 ${UNPACKDIR}/yosemite4-phosphor-multi-gpio-monitor.json \
                     ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json
-    install -m 0644 ${WORKDIR}/set-button-sled.service ${D}${systemd_system_unitdir}/set-button-sled.service
-    install -m 0644 ${WORKDIR}/probe-slot-device@.service ${D}${systemd_system_unitdir}/probe-slot-device@.service
-    install -m 0644 ${WORKDIR}/rescan-fru-ocp-setting@.service ${D}${systemd_system_unitdir}/rescan-fru-ocp-setting@.service
-    install -m 0644 ${WORKDIR}/slot-hot-plug@.service ${D}${systemd_system_unitdir}/slot-hot-plug@.service
-    install -m 0644 ${WORKDIR}/setup-nic-endpoint-slot@.service ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/reconfig-net-interface@.service  ${D}${systemd_system_unitdir}/reconfig-net-interface@.service
-    install -m 0644 ${WORKDIR}/remove-nic-endpoint-slot@.service ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/rescan-wf-bic@.service ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/slot-hsc-fault@.service ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/fan-board-efuse-fault@.service ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/disable-i3c-hub@.service ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/check-interrupt@.service ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/nic-power-fault@.service ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/en-i3c-hub-scan-fru@.service ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/slot-plug-in@.service ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/slot-unplug@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/set-button-sled.service ${D}${systemd_system_unitdir}/set-button-sled.service
+    install -m 0644 ${UNPACKDIR}/probe-slot-device@.service ${D}${systemd_system_unitdir}/probe-slot-device@.service
+    install -m 0644 ${UNPACKDIR}/rescan-fru-ocp-setting@.service ${D}${systemd_system_unitdir}/rescan-fru-ocp-setting@.service
+    install -m 0644 ${UNPACKDIR}/slot-hot-plug@.service ${D}${systemd_system_unitdir}/slot-hot-plug@.service
+    install -m 0644 ${UNPACKDIR}/setup-nic-endpoint-slot@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/reconfig-net-interface@.service  ${D}${systemd_system_unitdir}/reconfig-net-interface@.service
+    install -m 0644 ${UNPACKDIR}/remove-nic-endpoint-slot@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/rescan-wf-bic@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/slot-hsc-fault@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/fan-board-efuse-fault@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/disable-i3c-hub@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/check-interrupt@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/nic-power-fault@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/en-i3c-hub-scan-fru@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/slot-plug-in@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/slot-unplug@.service ${D}${systemd_system_unitdir}/
     install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/probe-slot-device ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/reconfig-net-interface ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/rescan-fru-ocp-setting ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/rescan-wf-bic ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/slot-hsc-fault ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/fan-board-efuse-fault ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/disable-i3c-hub ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/check-interrupt ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/nic-power-fault ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/en-i3c-hub-scan-fru ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/slot-plug-in ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/slot-unplug ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/probe-slot-device ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/reconfig-net-interface ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/rescan-fru-ocp-setting ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/rescan-wf-bic ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/slot-hsc-fault ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/fan-board-efuse-fault ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/disable-i3c-hub ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/check-interrupt ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/nic-power-fault ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/en-i3c-hub-scan-fru ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/slot-plug-in ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/slot-unplug ${D}${libexecdir}/${PN}/
     install -d ${D}/${bindir}
-    install -m 0755 ${WORKDIR}/configure-nic-mctp-endpoint ${D}/${bindir}/
+    install -m 0755 ${UNPACKDIR}/configure-nic-mctp-endpoint ${D}/${bindir}/
 }
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
index 74b3b6e..d8f2ec3 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
@@ -20,7 +20,7 @@
 
 do_install:append:() {
     install -d ${D}${datadir}/phosphor-health-monitor
-    install -m 0644 ${WORKDIR}/clean-up-filesystem.service ${D}${systemd_system_unitdir}/clean-up-filesystem.service
+    install -m 0644 ${UNPACKDIR}/clean-up-filesystem.service ${D}${systemd_system_unitdir}/clean-up-filesystem.service
     install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/clean-up-filesystem ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/clean-up-filesystem ${D}${libexecdir}/${PN}/
 }
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config-native.bb b/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config-native.bb
index 895d7ee..d7e0e8c 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config-native.bb
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config-native.bb
@@ -8,7 +8,8 @@
 PROVIDES += "virtual/phosphor-led-manager-config-native"
 
 SRC_URI += "file://led.yaml"
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 do_install() {
     SRC=${S}
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/pldm_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/pldm_%.bbappend
index 120e9a1..727e89d 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/pldm_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/pldm_%.bbappend
@@ -16,9 +16,9 @@
 
 do_install:append() {
     install -d ${D}/usr/share/pldm/bios
-    install -m 0644 ${WORKDIR}/boot_config_setting_attrs.json ${D}/usr/share/pldm/bios/boot_config_setting_attrs.json
+    install -m 0644 ${UNPACKDIR}/boot_config_setting_attrs.json ${D}/usr/share/pldm/bios/boot_config_setting_attrs.json
 
     install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/pldm_nic_power_cycle ${D}${libexecdir}/${PN}/
-    install -m 0644 ${WORKDIR}/pldm_nic_power_cycle@.service ${D}${systemd_system_unitdir}
+    install -m 0755 ${UNPACKDIR}/pldm_nic_power_cycle ${D}${libexecdir}/${PN}/
+    install -m 0644 ${UNPACKDIR}/pldm_nic_power_cycle@.service ${D}${systemd_system_unitdir}
 }
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index f7c32b2..e80f12a 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -57,23 +57,23 @@
 
 do_install:append() {
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/*.service ${D}${systemd_system_unitdir}/
 
     install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/chassis-poweroff ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/chassis-poweron ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/chassis-poweron-failure ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-poweroff ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-poweron ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-poweron-failure ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-powercycle ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-powerreset ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/power-cmd ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/wait-until-mctp-connection-done ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/wait-until-mctp-EID-remove ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/rescan-cxl-eid ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/check-i3c-hub ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/chassis-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/chassis-poweron ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/chassis-poweron-failure ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-poweron ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-poweron-failure ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/host-powerreset ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/power-cmd ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/wait-until-mctp-connection-done ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/wait-until-mctp-EID-remove ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/rescan-cxl-eid ${D}${libexecdir}/${PN}/
+    install -m 0755 ${UNPACKDIR}/check-i3c-hub ${D}${libexecdir}/${PN}/
 }
 
 FILES:${PN} += " ${systemd_system_unitdir}/*.service"
diff --git a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/plat-svc_0.1.bb b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/plat-svc_0.1.bb
index f50e0bb..0555e54 100644
--- a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/plat-svc_0.1.bb
+++ b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/plat-svc_0.1.bb
@@ -22,7 +22,7 @@
 
 do_install() {
     install -d ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/yosemite4-early-sys-init ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/yosemite4-schematic-init ${D}${libexecdir}
+    install -m 0755 ${UNPACKDIR}/yosemite4-early-sys-init ${D}${libexecdir}
+    install -m 0755 ${UNPACKDIR}/yosemite4-schematic-init ${D}${libexecdir}
 }
 
diff --git a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/yosemite4-common-functions_0.1.bb b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/yosemite4-common-functions_0.1.bb
index d087524..5f93d1c 100644
--- a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/yosemite4-common-functions_0.1.bb
+++ b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/yosemite4-common-functions_0.1.bb
@@ -9,5 +9,5 @@
 
 do_install() {
     install -d ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/yosemite4-common-functions ${D}${libexecdir}
+    install -m 0755 ${UNPACKDIR}/yosemite4-common-functions ${D}${libexecdir}
 }
diff --git a/meta-facebook/recipes-core/systemd/systemd_%.bbappend b/meta-facebook/recipes-core/systemd/systemd_%.bbappend
index 65d5909..0e290e8 100644
--- a/meta-facebook/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-facebook/recipes-core/systemd/systemd_%.bbappend
@@ -9,15 +9,15 @@
 do_install:append() {
 
     install -m 644 -D \
-        ${WORKDIR}/journald-size-policy-10MB.conf \
+        ${UNPACKDIR}/journald-size-policy-10MB.conf \
         ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy-10MB.conf
 
     install -m 644 -D \
-        ${WORKDIR}/journald-storage-policy.conf \
+        ${UNPACKDIR}/journald-storage-policy.conf \
         ${D}/${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf
 
     install -m 644 -D \
-        ${WORKDIR}/systemd-networkd-only-wait-for-one.conf \
+        ${UNPACKDIR}/systemd-networkd-only-wait-for-one.conf \
         ${D}${systemd_system_unitdir}/systemd-networkd-wait-online.service.d/systemd-networkd-only-wait-for-one.conf
 
 }
diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend
index 5fd46bd..9931934 100644
--- a/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend
+++ b/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend
@@ -12,13 +12,13 @@
 PACKAGECONFIG:append = " imjournal klog imfile"
 
 do_install:append() {
-        install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir}
-        install -m 0644 ${WORKDIR}/rotate-event-logs.timer ${D}${systemd_system_unitdir}
+        install -m 0644 ${UNPACKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir}
+        install -m 0644 ${UNPACKDIR}/rotate-event-logs.timer ${D}${systemd_system_unitdir}
         rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf
         for host in ${OBMC_HOST_INSTANCES}; do
             host_name="host${host}"
             conf=${D}${sysconfdir}/rsyslog.d/${host_name}.conf
-            install -m 644 ${WORKDIR}/rsyslog-oob-console.conf.in ${conf}
+            install -m 644 ${UNPACKDIR}/rsyslog-oob-console.conf.in ${conf}
             sed -i "s/__OOB_CONSOLE_HOST__/${host_name}/g;" ${conf}
         done
 }
diff --git a/meta-facebook/recipes-fb/emmc-init/emmc-init_0.1.bb b/meta-facebook/recipes-fb/emmc-init/emmc-init_0.1.bb
index 0a691e6..eda3544 100644
--- a/meta-facebook/recipes-fb/emmc-init/emmc-init_0.1.bb
+++ b/meta-facebook/recipes-fb/emmc-init/emmc-init_0.1.bb
@@ -15,7 +15,7 @@
 
 do_install:append() {
     install -d ${D}${libexecdir}/emmc-init
-    install -m 0755 ${WORKDIR}/emmc-init ${D}${libexecdir}/emmc-init
+    install -m 0755 ${UNPACKDIR}/emmc-init ${D}${libexecdir}/emmc-init
 }
 
 SYSTEMD_SERVICE:${PN} += "emmc-init.service"
diff --git a/meta-facebook/recipes-fb/network-wait-ipv6-ll/network-wait-ipv6-ll_0.1.bb b/meta-facebook/recipes-fb/network-wait-ipv6-ll/network-wait-ipv6-ll_0.1.bb
index 28e016e..a6c7575 100644
--- a/meta-facebook/recipes-fb/network-wait-ipv6-ll/network-wait-ipv6-ll_0.1.bb
+++ b/meta-facebook/recipes-fb/network-wait-ipv6-ll/network-wait-ipv6-ll_0.1.bb
@@ -12,7 +12,7 @@
 
 do_install() {
     install -d ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/check-ipv6-ll ${D}${libexecdir}
+    install -m 0755 ${UNPACKDIR}/check-ipv6-ll ${D}${libexecdir}
 }
 
 NCSI_ETH_INTF ?= "eth0"
diff --git a/meta-facebook/recipes-fb/obmc_functions/fb-common-functions_0.1.bb b/meta-facebook/recipes-fb/obmc_functions/fb-common-functions_0.1.bb
index ab50539..bd2d6ca 100644
--- a/meta-facebook/recipes-fb/obmc_functions/fb-common-functions_0.1.bb
+++ b/meta-facebook/recipes-fb/obmc_functions/fb-common-functions_0.1.bb
@@ -9,5 +9,5 @@
 
 do_install() {
     install -d ${D}${libexecdir}
-    install -m 0755 ${WORKDIR}/fb-common-functions ${D}${libexecdir}
+    install -m 0755 ${UNPACKDIR}/fb-common-functions ${D}${libexecdir}
 }
diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend
index bb5da86..b1735f9 100644
--- a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -21,16 +21,16 @@
 do_install:append:fb-withhost() {
     install -d ${D}${systemd_system_unitdir}
     for svc in ${PHOSPHOR_FAN_EXTRA_SERVICES}; do
-        install -m 0644 ${WORKDIR}/${svc} ${D}${systemd_system_unitdir}
+        install -m 0644 ${UNPACKDIR}/${svc} ${D}${systemd_system_unitdir}
     done
 
     # Store the bitbake variable OBMC_HOST_INSTANCES  inside the script as HOST_INSTANCES variable using sed.
-    sed -i -e "s,HOST_INSTANCES_SED_REPLACEMENT_VALUE,${OBMC_HOST_INSTANCES},g" ${WORKDIR}/host-poweroff
+    sed -i -e "s,HOST_INSTANCES_SED_REPLACEMENT_VALUE,${OBMC_HOST_INSTANCES},g" ${UNPACKDIR}/host-poweroff
 
     install -m 0755 -d ${D}/var/lib/phosphor-fan-presence/sensor-monitor
 
     install -d ${D}${libexecdir}/phosphor-fan-sensor-monitor
-    install -m 0755 ${WORKDIR}/host-poweroff ${D}${libexecdir}/phosphor-fan-sensor-monitor/
+    install -m 0755 ${UNPACKDIR}/host-poweroff ${D}${libexecdir}/phosphor-fan-sensor-monitor/
 }
 
 pkg_postinst:${PN}-sensor-monitor() {
diff --git a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 4a28bc2..2a67c24 100644
--- a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -11,19 +11,19 @@
 
 SYSTEMD_LINK:${PN}-monitor:append = " ../phosphor-multi-gpio-monitor.service:multi-user.target.requires/phosphor-multi-gpio-monitor.service"
 
-GPIO_HOST_TEMPLATES:append = " ${WORKDIR}/phosphor-multi-gpio-monitor.json"
+GPIO_HOST_TEMPLATES:append = " ${UNPACKDIR}/phosphor-multi-gpio-monitor.json"
 
 do_install:append:fb-compute-multihost() {
 
     install -d ${D}${datadir}/phosphor-gpio-monitor
-    install -m 0644 ${WORKDIR}/phosphor-multi-gpio-monitor.json \
+    install -m 0644 ${UNPACKDIR}/phosphor-multi-gpio-monitor.json \
                     ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json
 
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/obmc-ipmb-rescan-fru.service \
+    install -m 0644 ${UNPACKDIR}/obmc-ipmb-rescan-fru.service \
                     ${D}${systemd_system_unitdir}
 
     install -d ${D}${libexecdir}/phosphor-gpio-monitor
-    install -m 0755 ${WORKDIR}/ipmb-rescan-fru ${D}${libexecdir}/phosphor-gpio-monitor/
+    install -m 0755 ${UNPACKDIR}/ipmb-rescan-fru ${D}${libexecdir}/phosphor-gpio-monitor/
 }
 FILES:${PN} += "${systemd_system_unitdir}/obmc-ipmb-rescan-fru.service"
diff --git a/meta-facebook/recipes-phosphor/health/phosphor-health-monitor_%.bbappend b/meta-facebook/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
index ced5877..7f7b91b 100644
--- a/meta-facebook/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
+++ b/meta-facebook/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
@@ -18,18 +18,18 @@
 STORAGE_WARN_TGT ?= ""
 
 do_install:prepend() {
-    sed -i "s/\"CPU_CRIT_VAL\"/${CPU_CRIT_VAL}/g" ${WORKDIR}/bmc_health_config.json
-    sed -i "s/CPU_CRIT_TGT/${CPU_CRIT_TGT}/g" ${WORKDIR}/bmc_health_config.json
-    sed -i "s/\"CPU_WARN_VAL\"/${CPU_WARN_VAL}/g" ${WORKDIR}/bmc_health_config.json
-    sed -i "s/CPU_WARN_TGT/${CPU_WARN_TGT}/g" ${WORKDIR}/bmc_health_config.json
+    sed -i "s/\"CPU_CRIT_VAL\"/${CPU_CRIT_VAL}/g" ${UNPACKDIR}/bmc_health_config.json
+    sed -i "s/CPU_CRIT_TGT/${CPU_CRIT_TGT}/g" ${UNPACKDIR}/bmc_health_config.json
+    sed -i "s/\"CPU_WARN_VAL\"/${CPU_WARN_VAL}/g" ${UNPACKDIR}/bmc_health_config.json
+    sed -i "s/CPU_WARN_TGT/${CPU_WARN_TGT}/g" ${UNPACKDIR}/bmc_health_config.json
 
-    sed -i "s/\"MEM_CRIT_VAL\"/${MEM_CRIT_VAL}/g" ${WORKDIR}/bmc_health_config.json
-    sed -i "s/MEM_CRIT_TGT/${MEM_CRIT_TGT}/g" ${WORKDIR}/bmc_health_config.json
-    sed -i "s/\"MEM_WARN_VAL\"/${MEM_WARN_VAL}/g" ${WORKDIR}/bmc_health_config.json
-    sed -i "s/MEM_WARN_TGT/${MEM_WARN_TGT}/g" ${WORKDIR}/bmc_health_config.json
+    sed -i "s/\"MEM_CRIT_VAL\"/${MEM_CRIT_VAL}/g" ${UNPACKDIR}/bmc_health_config.json
+    sed -i "s/MEM_CRIT_TGT/${MEM_CRIT_TGT}/g" ${UNPACKDIR}/bmc_health_config.json
+    sed -i "s/\"MEM_WARN_VAL\"/${MEM_WARN_VAL}/g" ${UNPACKDIR}/bmc_health_config.json
+    sed -i "s/MEM_WARN_TGT/${MEM_WARN_TGT}/g" ${UNPACKDIR}/bmc_health_config.json
 
-    sed -i "s/\"STORAGE_CRIT_VAL\"/${STORAGE_CRIT_VAL}/g" ${WORKDIR}/bmc_health_config.json
-    sed -i "s/STORAGE_CRIT_TGT/${STORAGE_CRIT_TGT}/g" ${WORKDIR}/bmc_health_config.json
-    sed -i "s/\"STORAGE_WARN_VAL\"/${STORAGE_WARN_VAL}/g" ${WORKDIR}/bmc_health_config.json
-    sed -i "s/STORAGE_WARN_TGT/${STORAGE_WARN_TGT}/g" ${WORKDIR}/bmc_health_config.json
+    sed -i "s/\"STORAGE_CRIT_VAL\"/${STORAGE_CRIT_VAL}/g" ${UNPACKDIR}/bmc_health_config.json
+    sed -i "s/STORAGE_CRIT_TGT/${STORAGE_CRIT_TGT}/g" ${UNPACKDIR}/bmc_health_config.json
+    sed -i "s/\"STORAGE_WARN_VAL\"/${STORAGE_WARN_VAL}/g" ${UNPACKDIR}/bmc_health_config.json
+    sed -i "s/STORAGE_WARN_TGT/${STORAGE_WARN_TGT}/g" ${UNPACKDIR}/bmc_health_config.json
 }
diff --git a/meta-facebook/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-facebook/recipes-phosphor/network/phosphor-network_%.bbappend
index a28f1ea..7b12167 100644
--- a/meta-facebook/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-facebook/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -8,5 +8,5 @@
 
 do_install:append() {
     install -d ${D}${systemd_unitdir}/network/
-    install -m 0644 ${WORKDIR}/01-bmc-eth.network ${D}${systemd_unitdir}/network/01-bmc-eth.network
+    install -m 0644 ${UNPACKDIR}/01-bmc-eth.network ${D}${systemd_unitdir}/network/01-bmc-eth.network
 }
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index c428550..f7ddb60 100644
--- a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -13,6 +13,6 @@
     # Install the ones from our meta-layer.
     install -d ${D}${datadir}/phosphor-virtual-sensor
     for s in ${SENSOR_CONFIGS}; do
-        install -m 0644 ${WORKDIR}/$s ${D}${datadir}/phosphor-virtual-sensor
+        install -m 0644 ${UNPACKDIR}/$s ${D}${datadir}/phosphor-virtual-sensor
     done
 }
diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend
index 59f3078..6bb94b2 100644
--- a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend
+++ b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend
@@ -8,6 +8,6 @@
 
 do_install:append:yosemitev2() {
     install -m 0755 -d ${D}/${datadir}/${BPN}
-    install -m 0644 -D ${WORKDIR}/*.json \
+    install -m 0644 -D ${UNPACKDIR}/*.json \
                    ${D}/${datadir}/${BPN}/
 }