diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-local-eid.conf b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-local-eid.conf
index 7a3d8ee..299ccf2 100644
--- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-local-eid.conf
+++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-local-eid.conf
@@ -3,6 +3,6 @@
 Requires=xyz.openbmc_project.EntityManager.service
 
 [Service]
-ExecStartPre=-/usr/share/mctp/mctp-config.sh
+ExecStartPre=-/usr/libexec/mctp/mctp-config.sh
 Restart=always
 RestartSec=10
diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.conf b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.conf
index ad532c9..e629739 100644
--- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.conf
+++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.conf
@@ -3,6 +3,6 @@
 Requires=mctpd.service
 
 [Service]
-ExecStartPost=-/usr/share/mctp/setup-static-endpoints.sh
+ExecStartPost=-/usr/libexec/mctp/setup-static-endpoints.sh
 Restart=always
 RestartSec=10
diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.sh b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.sh
index 6cacf32..be922d6 100644
--- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.sh
+++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.sh
@@ -5,7 +5,7 @@
 # gpioget is not possible.
 
 # shellcheck source=meta-facebook/meta-yosemite4/recipes-networking/mctp/files/nic-gpio-addrs.sh
-. /usr/share/mctp/nic-gpio-addrs.sh
+. /usr/libexec/mctp/nic-gpio-addrs.sh
 
 # Setup slot1 NIC
 gpio_val=$(devmem "$PRSNT_NIC0" "$WIDTH")
diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend b/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend
index 41e2a65..b97697d 100644
--- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend
@@ -13,16 +13,18 @@
 do_install:append () {
     override_dir=${D}${systemd_system_unitdir}/mctpd.service.d
     install -d ${D}${systemd_system_unitdir}/mctpd.service.d
-    install -d ${D}${datadir}/mctp
+
     install -m 0644 ${WORKDIR}/setup-local-eid.conf \
             ${override_dir}/setup-local-eid.conf
     install -m 0644 ${WORKDIR}/setup-static-endpoints.conf \
             ${override_dir}/setup-static-endpoints.conf
+
+    install -d ${D}${libexecdir}/mctp
+
     install -m 0755 ${WORKDIR}/mctp-config.sh \
-            ${D}${datadir}/mctp/
+            ${D}${libexecdir}/mctp/
     install -m 0755 ${WORKDIR}/setup-static-endpoints.sh \
-            ${D}${datadir}/mctp/
-    install -d ${D}${datadir}/mctp
+            ${D}${libexecdir}/mctp/
     install -m 0755 ${WORKDIR}/nic-gpio-addrs.sh \
-            ${D}${datadir}/mctp/
+            ${D}${libexecdir}/mctp/
 }