diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb
index 26cab2c..5cb0053 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb
@@ -5,6 +5,8 @@
 inherit obmc-phosphor-systemd
 inherit obmc-phosphor-license
 
+RDEPENDS_${PN} += "op-proc-control"
+
 TGTFMT = "obmc-chassis-poweron@{0}.target"
 
 TMPL_SCAN = "fsi-scan@.service"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
index c8db153..d8f2888 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
@@ -7,7 +7,9 @@
 Conflicts=obmc-chassis-poweroff@%i.target
 
 [Service]
-ExecStart=/bin/sh -c "if [ -f /sys/bus/platform/devices/gpio-fsi/fsi0/rescan ]; then echo 1 > /sys/bus/platform/devices/gpio-fsi/fsi0/rescan; else echo 1 > /sys/bus/platform/devices/fsi-master/scan; fi"
+ExecStart=/usr/bin/env openpower-proc-control scanFSI
+SyslogIdentifier=openpower-proc-control
+
 Type=oneshot
 RemainAfterExit=yes