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 fac0cd4..ba68288 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
@@ -6,40 +6,42 @@
 inherit obmc-phosphor-systemd
 
 RDEPENDS:${PN} += "bash"
-RDEPENDS:${PN} += "libgpiod-tools"
 RDEPENDS:${PN} += "i2c-tools"
+RDEPENDS:${PN} += "libgpiod-tools"
 
 S = "${WORKDIR}"
-SRC_URI += "file://motor-init \
-                    file://motor-ctrl \
-                    file://power-ctrl "
+SRC_URI += " \
+    file://motor-ctrl \
+    file://motor-init \
+    file://power-ctrl \
+    "
 
 do_install() {
         install -d ${D}${sbindir}
         install -m 0755 ${WORKDIR}/power-ctrl ${D}${sbindir}
 
         install -d ${D}${libexecdir}
-        install -m 0755 ${WORKDIR}/motor-init ${D}${libexecdir}
         install -m 0755 ${WORKDIR}/motor-ctrl ${D}${libexecdir}
+        install -m 0755 ${WORKDIR}/motor-init ${D}${libexecdir}
 }
 
-MOTOR_INIT_INSTFMT= "motor-init-calibration@{0}.service"
+MOTOR_INIT_INSTFMT="motor-init-calibration@.service:motor-init-calibration@{0}.service"
 PWR_ON_INSTFMT="host-poweron@.service:host-poweron@{0}.service"
 PWR_OFF_INSTFMT="host-poweroff@.service:host-poweroff@{0}.service"
-AC_ON_INSTFMT="host-ac-on@{0}.service"
+AC_ON_INSTFMT="host-ac-on@.service:host-ac-on@{0}.service"
 AC_OFF_INSTFMT="host-ac-off@.service:host-ac-off@{0}.service"
 
-SYSTEMD_SERVICE:${PN} ="${@compose_list(d, 'MOTOR_INIT_INSTFMT', 'OBMC_HOST_INSTANCES')}"
-FILES:${PN}  += "${systemd_system_unitdir}/motor-init-calibration@.service"
+SYSTEMD_SERVICE:${PN} += "motor-init-calibration@.service"
+SYSTEMD_LINK:${PN} += "${@compose_list(d, 'MOTOR_INIT_INSTFMT', 'OBMC_HOST_INSTANCES')}"
 
-SYSTEMD_SERVICE:${PN} +="host-poweron@.service"
+SYSTEMD_SERVICE:${PN} += "host-poweron@.service"
 SYSTEMD_LINK:${PN} += "${@compose_list(d, 'PWR_ON_INSTFMT', 'OBMC_HOST_INSTANCES')}"
 
-SYSTEMD_SERVICE:${PN} +="host-poweroff@.service"
+SYSTEMD_SERVICE:${PN} += "host-poweroff@.service"
 SYSTEMD_LINK:${PN} += "${@compose_list(d, 'PWR_OFF_INSTFMT', 'OBMC_HOST_INSTANCES')}"
 
-SYSTEMD_SERVICE:${PN} +="${@compose_list(d, 'AC_ON_INSTFMT', 'OBMC_HOST_INSTANCES')}"
-FILES:${PN}  += "${systemd_system_unitdir}/host-ac-#@.service"
+SYSTEMD_SERVICE:${PN} += "host-ac-on@.service"
+SYSTEMD_LINK:${PN} += "${@compose_list(d, 'AC_ON_INSTFMT', 'OBMC_HOST_INSTANCES')}"
 
-SYSTEMD_SERVICE:${PN} +="host-ac-off@.service"
+SYSTEMD_SERVICE:${PN} += "host-ac-off@.service"
 SYSTEMD_LINK:${PN} += "${@compose_list(d, 'AC_OFF_INSTFMT', 'OBMC_HOST_INSTANCES')}"