diff --git a/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend b/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend
index 0e4429e..278f7b6 100644
--- a/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend
+++ b/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend
@@ -12,8 +12,8 @@
 
     install -d ${D}$/lib/systemd/system
     install -m 0644 ${WORKDIR}/bmc-set-time.service  ${D}$/lib/systemd/system
-    install -d ${D}/usr/libexec
-    install -m 0777 ${WORKDIR}/set-bmc-time-from-host ${D}/usr/libexec
+    install -d ${D}${libexecdir}
+    install -m 0777 ${WORKDIR}/set-bmc-time-from-host ${D}${libexecdir}
 }
 
 SYSTEMD_SERVICE:${PN}:fb-withhost += "bmc-set-time.service"
diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 9ed68ab..e9dcf33 100644
--- a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -30,8 +30,8 @@
 
     install -m 0755 -d ${D}/var/lib/phosphor-fan-presence/sensor-monitor
 
-    install -d ${D}/usr/libexec/phosphor-fan-sensor-monitor
-    install -m 0777 ${WORKDIR}/host-poweroff ${D}/usr/libexec/phosphor-fan-sensor-monitor/
+    install -d ${D}${libexecdir}/phosphor-fan-sensor-monitor
+    install -m 0777 ${WORKDIR}/host-poweroff ${D}${libexecdir}/phosphor-fan-sensor-monitor/
 }
 
 pkg_postinst:${PN}-sensor-monitor() {
@@ -48,5 +48,5 @@
     ln -s $TARGET $LINK
 }
 
-FILES:${PN}-sensor-monitor += "/usr/libexec/phosphor-fan-sensor-monitor/host-poweroff"
+FILES:${PN}-sensor-monitor += "${libexecdir}/phosphor-fan-sensor-monitor/host-poweroff"
 FILES:${PN}-sensor-monitor += "${systemd_system_unitdir}"
diff --git a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index cd11f54..398ccf7 100644
--- a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -23,7 +23,7 @@
     install -m 0644 ${WORKDIR}/obmc-ipmb-rescan-fru.service \
                     ${D}${systemd_system_unitdir}
 
-    install -d ${D}/usr/libexec/phosphor-gpio-monitor
-    install -m 0777 ${WORKDIR}/ipmb-rescan-fru.sh ${D}/usr/libexec/phosphor-gpio-monitor/
+    install -d ${D}${libexecdir}/phosphor-gpio-monitor
+    install -m 0777 ${WORKDIR}/ipmb-rescan-fru.sh ${D}${libexecdir}/phosphor-gpio-monitor/
 }
 FILES:${PN} += "/lib/systemd/system/obmc-ipmb-rescan-fru.service"